From: Stefan Kangas Date: Sun, 3 Dec 2023 22:31:30 +0000 (+0100) Subject: ; Fix typos X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2635598fade3b736638c49208ba739ff4c181a52;p=emacs.git ; Fix typos --- diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index d6627a2a1ca..eb8ff413b79 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -14630,7 +14630,7 @@ almost the same code as for the recursive version of @need 800 @noindent -Let's re-use @kbd{C-c =} as a convenient key binding: +Let's reuse @kbd{C-c =} as a convenient key binding: @smallexample (global-set-key "\C-c=" 'count-words-defun) diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi index d4b1c4f2b3e..bdc3b7307cf 100644 --- a/doc/lispref/keymaps.texi +++ b/doc/lispref/keymaps.texi @@ -491,7 +491,7 @@ useful if there is a command which doesn't exist in the map being defined, but which should have the @code{repeat-map} property. If the @code{:exit} list is empty then no commands in the map exit -@code{repeat-mode}. Specifying one ore more commands in this list is +@code{repeat-mode}. Specifying one or more commands in this list is useful if the keymap being defined contains a command that should not have the @code{repeat-map} property. @end table diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index c651b007173..7e9ba59d008 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -11954,7 +11954,7 @@ trail pointer in various ways. @cindex Retrieving previous results The @kbd{t y} (@code{calc-trail-yank}) command reads the selected value in the trail and pushes it onto the Calculator stack. It allows you to -re-use any previously computed value without retyping. With a numeric +reuse any previously computed value without retyping. With a numeric prefix argument @var{n}, it yanks the value @var{n} lines above the current trail pointer. diff --git a/doc/misc/eglot.texi b/doc/misc/eglot.texi index 2d6fcb29d3f..5243a6530dc 100644 --- a/doc/misc/eglot.texi +++ b/doc/misc/eglot.texi @@ -1222,7 +1222,7 @@ in @ref{Project-specific configuration}. Here is an example: @end lisp Note that the global value of @code{eglot-workspace-configuration} is -always overriden if a directory-local value is detected. +always overridden if a directory-local value is detected. @node JSONRPC objects in Elisp @section JSONRPC objects in Elisp diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi index 1aeaef8990f..b7aff0077e6 100644 --- a/doc/misc/epa.texi +++ b/doc/misc/epa.texi @@ -456,9 +456,9 @@ public key, it does not prompt for a passphrase for the buffer save, but it will prompt for your passphrase for file reads every now and then, depending on the GnuPG Agent cache configuration. -@cindex tempory files created by easypg assistant +@cindex temporary files created by easypg assistant To encrypt and decrypt files as described above EasyPG Assistant under -certain circumstances uses intermediate tempory files that contain the +certain circumstances uses intermediate temporary files that contain the plain-text contents of the files it processes. EasyPG Assistant creates them below the directory returned by function @code{temporary-file-directory} (@pxref{Unique File Names, , diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org index 5a53426dfee..a986f6f1f68 100644 --- a/doc/misc/modus-themes.org +++ b/doc/misc/modus-themes.org @@ -3554,6 +3554,101 @@ With those in place, PDFs have a distinct backdrop for their page, while buffers with major-mode as ~pdf-view-mode~ automatically switches to dark mode when ~modus-themes-toggle~ is called. +** Decrease mode line height +:properties: +:custom_id: h:03be4438-dae1-4961-9596-60a307c070b5 +:end: +#+cindex: Decrease mode line height + +By default, the mode line of the Modus themes is set to 1 pixel width +for its =:box= attribute. In contrast, the mode line of stock Emacs is -1 +pixel. This small difference is considered necessary for the purposes +of accessibility as our out-of-the-box design has a prominent color +around the mode line (a border) to make its boundaries clear. With a +negative width the border and the text on the mode line can feel a bit +more difficult to read under certain scenaria. + +Furthermore, the user option ~modus-themes-mode-line~ ([[#h:27943af6-d950-42d0-bc23-106e43f50a24][Mode line]]) does not +allow for such a negative value because there are many edge cases that +simply make for a counter-intuitive set of possibilities, such as a =0= +value not being acceptable by the underlying face infrastructure, and +negative values greater than =-2= not being particularly usable. + +For these reasons, users who wish to decrease the overall height of the +mode line must handle things on their own by implementing the methods +for face customization documented herein. + +[[#h:1487c631-f4fe-490d-8d58-d72ffa3bd474][Basic face customization]]. + +One such method is to create a function that configures the desired +faces and hook it to ~modus-themes-after-load-theme-hook~ so that it +persists while switching between the Modus themes with the command +~modus-themes-toggle~. + +This one simply disables the box altogether, which will reduce the +height of the mode lines, but also remove their border: + +#+begin_src emacs-lisp +(defun my-modus-themes-custom-faces () + (set-face-attribute 'mode-line nil :box nil) + (set-face-attribute 'mode-line-inactive nil :box nil)) + +(add-hook 'modus-themes-after-load-theme-hook #'my-modus-themes-custom-faces) +#+end_src + +The above relies on the ~set-face-attribute~ function, though users who +plan to reuse colors from the theme and do so at scale are better off +with the more streamlined combination of the ~modus-themes-with-colors~ +macro and ~custom-set-faces~. + +[[#h:51ba3547-b8c8-40d6-ba5a-4586477fd4ae][Face customization at scale]]. + +As explained before in this document, this approach has a syntax that is +consistent with the source code of the themes, so it probably is easier +to reuse parts of the design. + +The following emulates the stock Emacs style, while still using the +colors of the Modus themes (whichever attribute is not explicitly stated +is inherited from the underlying theme): + +#+begin_src emacs-lisp +(defun my-modus-themes-custom-faces () + (modus-themes-with-colors + (custom-set-faces + `(mode-line ((,class :box (:line-width -1 :style released-button)))) + `(mode-line-inactive ((,class :box (:line-width -1 :color ,bg-region))))))) + +(add-hook 'modus-themes-after-load-theme-hook #'my-modus-themes-custom-faces) +#+end_src + +And this one is like the out-of-the-box style of the Modus themes, but +with the -1 height instead of 1: + +#+begin_src emacs-lisp +(defun my-modus-themes-custom-faces () + (modus-themes-with-colors + (custom-set-faces + `(mode-line ((,class :box (:line-width -1 :color ,fg-alt)))) + `(mode-line-inactive ((,class :box (:line-width -1 :color ,bg-region))))))) + +(add-hook 'modus-themes-after-load-theme-hook #'my-modus-themes-custom-faces) +#+end_src + +Finally, to also change the background color of the active mode line, +such as that it looks like the "accented" variant which is possible via +the user option ~modus-themes-mode-line~, the =:background= attribute needs +to be specified as well: + +#+begin_src emacs-lisp +(defun my-modus-themes-custom-faces () + (modus-themes-with-colors + (custom-set-faces + `(mode-line ((,class :box (:line-width -1 :color ,fg-alt) :background ,bg-active-accent))) + `(mode-line-inactive ((,class :box (:line-width -1 :color ,bg-region))))))) + +(add-hook 'modus-themes-after-load-theme-hook #'my-modus-themes-custom-faces) +#+end_src + ** Toggle themes without reloading them :properties: :custom_id: h:b40aca50-a3b2-4c43-be58-2c26fcd14237 @@ -4396,7 +4491,7 @@ advanced customization options of the themes. [[#h:f4651d55-8c07-46aa-b52b-bed1e53463bb][Advanced customization]]. In the following example, we are assuming that the user wants to (i) -re-use color variables provided by the themes, (ii) be able to retain +reuse color variables provided by the themes, (ii) be able to retain their tweaks while switching between ~modus-operandi~ and ~modus-vivendi~, and (iii) have the option to highlight either the foreground of the parentheses or the background as well. @@ -4416,7 +4511,7 @@ Then we can update our preference with this: (setq my-highlight-parentheses-use-background nil) #+end_src -To re-use colors from the themes, we must wrap our code in the +To reuse colors from the themes, we must wrap our code in the ~modus-themes-with-colors~ macro. Our implementation must interface with the variables ~highlight-parentheses-background-colors~ and/or ~highlight-parentheses-colors~. @@ -5026,7 +5121,7 @@ more effective than trying to do the same with either red or blue (the latter is the least effective in that regard). When we need to work with several colors, it is always better to have -sufficient manoeuvring space, especially since we cannot pick arbitrary +sufficient maneuvering space, especially since we cannot pick arbitrary colors but only those that satisfy the accessibility objectives of the themes. diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi index eb411f29c5c..e8b41315000 100644 --- a/doc/misc/widget.texi +++ b/doc/misc/widget.texi @@ -1703,7 +1703,7 @@ A variable that holds the history of field minibuffer edits. @item :prompt-value A function that uses the @code{:prompt-internal} function and the -@code{:prompt-history} value to prompt for a string, and retun the +@code{:prompt-history} value to prompt for a string, and return the user response in the external format. @item :action @@ -1714,7 +1714,7 @@ Function that takes care of creating the widget, respecting its @code{:size} and @code{:value}. @item :value-set -Function to use to modify programatically the current value of the +Function to use to modify programmatically the current value of the widget. @item :value-delete @@ -2455,7 +2455,7 @@ difference from the @code{const} widget is that they will allow the user to see the variable or function documentation for the symbol. This is accomplished via using the @samp{%h} format escape, and adding -an appropiate @code{:documentation-property} function for each widget. +an appropriate @code{:documentation-property} function for each widget. @deffn Widget variable-item An immutable symbol that is bound as a variable. diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index 7b39af03a88..4642c742b0f 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS @@ -1706,7 +1706,7 @@ Only the macros in cl-macs.el are used. ** Make flood protection toggle-able as on/off, removing the 'strict option. -** If possible, re-use channel buffers when reconnecting to a server. +** If possible, reuse channel buffers when reconnecting to a server. ** Text in ERC buffers is now read-only by default. To get the previous behavior, diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 5f92c056018..1e87f10748f 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -1098,7 +1098,7 @@ Conversion to SVG exposes a number of additional customizations that give the user full control over the contents of the latex source block. ~org-babel-latex-preamble~, ~org-babel-latex-begin-env~ and ~org-babel-latex-end-env~ are new customization options added to allow -the user to specify the preamble and code that preceedes and proceeds +the user to specify the preamble and code that precedes and proceeds the contents of the source block. *** New option ~org-html-meta-tags~ allows for HTML meta tags customization diff --git a/etc/PROBLEMS b/etc/PROBLEMS index fdce1bc81ba..7159fe32c1c 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -2014,7 +2014,7 @@ remote X server, try this: *** Dropping text on xterm doesn't work. -Emacs sends sythetic button events to legacy clients such as xterm +Emacs sends synthetic button events to legacy clients such as xterm that do not support either the XDND or Motif drag-and-drop protocols in order to "paste" the text that was dropped. Unfortunately, xterm is configured to ignore these events by default. Add the following to diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index 84040b572bc..64fd2901a49 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -1046,7 +1046,7 @@ Output must be in semanticdb Find result format." (and last-prefix (string-prefix-p last-prefix prefix t))) ;; We have the same prefix, or last-prefix is a ;; substring of the of new prefix, in which case we are - ;; refining our symbol so just re-use cache. + ;; refining our symbol so just reuse cache. (oref obj last-all-completions)) ((and last-prefix (> (length prefix) 1) diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el index 4eb7632b721..7e74746f1da 100644 --- a/lisp/cedet/srecode/extract.el +++ b/lisp/cedet/srecode/extract.el @@ -33,7 +33,7 @@ ;; or deep template calls can be extracted. ;; ;; This code was specifically written for srecode-document, which -;; wants to extract user written text, and re-use it in a reformatted +;; wants to extract user written text, and reuse it in a reformatted ;; comment. (require 'srecode) diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el index 6bd416c5690..30509298ddc 100644 --- a/lisp/cedet/srecode/srt-mode.el +++ b/lisp/cedet/srecode/srt-mode.el @@ -420,7 +420,7 @@ Moves to the end of one named section." (when (string= (car (car subdicts)) name) (setq res (cdr (car subdicts)))) (setq subdicts (cdr subdicts))) - ;; Pre-pend our global vars. + ;; Prepend our global vars. (append global res)) ;; If we aren't in a subsection, just do the global variables global diff --git a/lisp/desktop.el b/lisp/desktop.el index f096f13ab80..0b27dde1d70 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -293,7 +293,7 @@ May be used to show a dired buffer." :version "22.1") (defcustom desktop-not-loaded-hook nil - "Normal hook run when the user declines to re-use a desktop file. + "Normal hook run when the user declines to reuse a desktop file. Run in the directory in which the desktop file was found. May be used to deal with accidental multiple Emacs jobs." :type 'hook diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el index e47e93cda18..339a6142178 100644 --- a/lisp/emacs-lisp/comp-cstr.el +++ b/lisp/emacs-lisp/comp-cstr.el @@ -797,7 +797,7 @@ DST is returned." (cl-loop for val in (valset src) ;; If (member value) is subtypep of all other sources then - ;; is good to be colleted. + ;; is good to be collected. when (cl-every (lambda (s) (or (memql val (valset s)) (cl-some (lambda (type) diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 3e5ff195764..3b2fd25e61c 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -3497,7 +3497,7 @@ last directory in `native-comp-eln-load-path')." Make sure that eln file is younger than byte-compiled one and return the filename of this last. -This function can be used only in conjuntion with +This function can be used only in conjunction with `byte+native-compile' `byte-to-native-output-buffer-file' (see `batch-byte+native-compile')." (pcase byte-to-native-output-buffer-file diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index 61d8341bdad..84b50777684 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -99,7 +99,7 @@ Even modest settings for `print-length' and `print-level' can produce extremely long lines in backtraces and lengthy delays in forming them. This variable governs the target maximum line length by manipulating these two variables while printing stack -traces. Setting this variable to t will re-use the value of +traces. Setting this variable to t will reuse the value of `backtrace-line-length' while printing stack traces in ERT batch mode. Any other value will be temporarily bound to `backtrace-line-length' when producing stack traces in batch diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index ee481dc4ed3..c2d9b12c8ad 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -93,7 +93,7 @@ report errors as appropriate for this kind of usage." (defun mark-sexp (&optional arg allow-extend) "Set mark ARG sexps from point or move mark one sexp. -When called from Lisp with ALLOW-EXTEND ommitted or nil, mark is +When called from Lisp with ALLOW-EXTEND omitted or nil, mark is set ARG sexps from point. With ARG and ALLOW-EXTEND both non-nil (interactively, with prefix argument), the place to which mark goes is the same place \\[forward-sexp] diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index 9780e4d53de..645257cc38a 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -29,7 +29,7 @@ ;; To install a package from source use `package-vc-install'. If you ;; aren't interested in activating a package, you can use ;; `package-vc-checkout' instead, which will prompt you for a target -;; directory. If you wish to re-use an existing checkout, the command +;; directory. If you wish to reuse an existing checkout, the command ;; `package-vc-install-from-checkout' will create a symbolic link and ;; prepare the package. ;; diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index 47c59f76b5c..1133b2416bb 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el @@ -169,7 +169,7 @@ You can also use \\[erc-nickserv-identify-mode] to change modes." :type 'boolean) (defcustom erc-use-auth-source-for-nickserv-password nil - "Query auth-source for a password when identifiying to NickServ. + "Query auth-source for a password when identifying to NickServ. Passwords from `erc-nickserv-passwords' take precedence. See function `erc-nickserv-get-password'." :version "28.1" diff --git a/lisp/gnus/gnus-search.el b/lisp/gnus/gnus-search.el index 839e5d203ff..282afaeb540 100644 --- a/lisp/gnus/gnus-search.el +++ b/lisp/gnus/gnus-search.el @@ -1450,7 +1450,7 @@ Returns a list of [group article score] vectors." (when (and f-name (file-readable-p f-name) (null (file-directory-p f-name))) - ;; `expand-file-name' canoncalizes the file name, + ;; `expand-file-name' canonicalizes the file name, ;; specifically collapsing multiple consecutive directory ;; separators. (setq f-name (expand-file-name f-name) diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index 8728aab1def..be1a4056154 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el @@ -1030,7 +1030,7 @@ all. This may very well take some time.") (defun nndiary-generate-nov-databases (&optional server) "Generate NOV databases in all nndiary directories." (interactive (list (or (nnoo-current-server 'nndiary) ""))) - ;; Read the active file to make sure we don't re-use articles + ;; Read the active file to make sure we don't reuse articles ;; numbers in empty groups. (nnmail-activate 'nndiary) (unless (nndiary-server-opened server) diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el index d969716f020..44962c61b4b 100644 --- a/lisp/gnus/nnml.el +++ b/lisp/gnus/nnml.el @@ -830,7 +830,7 @@ article number. This function is called narrowed to an article." (defun nnml-generate-nov-databases (&optional server) "Generate NOV databases in all nnml directories." (interactive (list (or (nnoo-current-server 'nnml) ""))) - ;; Read the active file to make sure we don't re-use articles + ;; Read the active file to make sure we don't reuse articles ;; numbers in empty groups. (nnmail-activate 'nnml) (unless (nnml-server-opened server) diff --git a/lisp/language/hanja-util.el b/lisp/language/hanja-util.el index b5ef9230d27..d68f8a76988 100644 --- a/lisp/language/hanja-util.el +++ b/lisp/language/hanja-util.el @@ -6437,7 +6437,7 @@ character. This variable is initialized by `hanja-init-load'.") (message ""))) ;; List of current conversion status. -;; The first element is the strating position of shown list. +;; The first element is the starting position of shown list. ;; It is a group number each split by `hanja-list-width'. ;; The second element is the position of selected element. ;; The third element is a list of suitable Hanja candidate. diff --git a/lisp/loadup.el b/lisp/loadup.el index 03ed2186392..4be4d191d1d 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -506,23 +506,23 @@ lost after dumping"))) ;; At this point, we're ready to resume undo recording for scratch. (buffer-enable-undo "*scratch*") -(defvar load--bin-dest-dir nil - "Store the original value passed by \"--bin-dest\" during dump. -Internal use only.") -(defvar load--eln-dest-dir nil - "Store the original value passed by \"--eln-dest\" during dump. -Internal use only.") - -(defun load--fixup-all-elns () - "Fix all compilation unit filename. -This to have it working when installed or if Emacs source -directory got moved. This is set to be a pair in the form of: -\(rel-filename-from-install-bin . rel-filename-from-local-bin)." - (when (and load--bin-dest-dir load--eln-dest-dir) - (setq eln-dest-dir - (concat load--eln-dest-dir "native-lisp/" comp-native-version-dir "/")) - (maphash (lambda (_ cu) - (when (stringp (native-comp-unit-file cu)) +(defvar comp-subr-arities-h) +(when (featurep 'native-compile) + ;; Save the arity for all primitives so the compiler can always + ;; retrieve it even in case of redefinition. + (mapatoms (lambda (f) + (when (subr-primitive-p (symbol-function f)) + (puthash f (func-arity f) comp-subr-arities-h)))) + ;; Fix the compilation unit filename to have it working when + ;; installed or if the source directory got moved. This is set to be + ;; a pair in the form of: + ;; (rel-filename-from-install-bin . rel-filename-from-local-bin). + (let ((bin-dest-dir (cadr (member "--bin-dest" command-line-args))) + (eln-dest-dir (cadr (member "--eln-dest" command-line-args)))) + (when (and bin-dest-dir eln-dest-dir) + (setq eln-dest-dir + (concat eln-dest-dir "native-lisp/" comp-native-version-dir "/")) + (maphash (lambda (_ cu) (let* ((file (native-comp-unit-file cu)) (preloaded (equal (substring (file-name-directory file) -10 -1) diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el index 6d61dcd8208..ae483ef2d14 100644 --- a/lisp/mail/rmailout.el +++ b/lisp/mail/rmailout.el @@ -453,7 +453,7 @@ display message number MSG." (narrow-to-region (point-max) (point-max))) (insert-buffer-substring tembuf) (rmail-count-new-messages t) - ;; FIXME should re-use existing windows. + ;; FIXME should reuse existing windows. (if (rmail-summary-exists) (rmail-select-summary (rmail-update-summary))) (rmail-show-message-1 msg))) diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el index 39988ba6cfb..3b2714f3cc4 100644 --- a/lisp/net/newst-treeview.el +++ b/lisp/net/newst-treeview.el @@ -1466,7 +1466,7 @@ Move to next item unless DONT-PROCEED is non-nil." nil))) (defun newsticker--treeview-get-second-child (node) - "Get scond child of NODE." + "Get second child of NODE." (let ((children (widget-get node :children))) (if children (car (cdr children)) diff --git a/lisp/net/sieve-manage.el b/lisp/net/sieve-manage.el index 81f50e74987..4a9c6b18d5a 100644 --- a/lisp/net/sieve-manage.el +++ b/lisp/net/sieve-manage.el @@ -171,8 +171,11 @@ Valid states are `closed', `initial', `nonauth', and `auth'.") "Append ARGS to sieve-manage log buffer. ARGS can be a string or a list of strings. -The buffer to use for logging is specifified via -`sieve-manage-log'. If it is nil, logging is disabled." +The buffer to use for logging is specified via `sieve-manage-log'. +If it is nil, logging is disabled. + +When the `sieve-manage-log' buffer doesn't exist, it gets created (and +configured with some initial settings)." (when sieve-manage-log (with-current-buffer (or (get-buffer sieve-manage-log) (with-current-buffer diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el index b2bb59a25a0..e6053007475 100644 --- a/lisp/net/soap-client.el +++ b/lisp/net/soap-client.el @@ -1956,7 +1956,7 @@ This is a specialization of `soap-decode-type' for (xml-get-children node (intern e-name))) ;; e-name is nil so a) we don't know which ;; children to operate on, and b) we want to - ;; re-use soap-decode-xs-complex-type, which + ;; reuse soap-decode-xs-complex-type, which ;; expects a node argument with a complex ;; type; therefore we need to operate on the ;; entire node. We wrap node in a list so diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 660b5f53a5f..6340cc6b9a7 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -2523,6 +2523,8 @@ The method used must be an out-of-band method." (tramp-get-connection-name v) (tramp-get-connection-buffer v) copy-program copy-args))) + (tramp-message v 6 "%s" (string-join (process-command p) " ")) + (process-put p 'tramp-vector v) ;; This is needed for ssh or PuTTY based processes, and ;; only if the respective options are set. Perhaps, ;; the setting could be more fine-grained. @@ -3847,6 +3849,8 @@ Fall back to normal file name handler if no Tramp handler exists." v 'file-notify-error "`%s' failed to start on remote host" (string-join sequence " ")) + (tramp-message v 6 "Run `%s', %S" (string-join sequence " ") p) + (process-put p 'tramp-vector v) ;; This is needed for ssh or PuTTY based processes, and only if ;; the respective options are set. Perhaps, the setting could ;; be more fine-grained. @@ -5255,14 +5259,16 @@ connection if a previous connection has died for some reason." (and tramp-encoding-command-interactive `(,tramp-encoding-command-interactive))))))) - ;; This is needed for ssh or PuTTY based processes, - ;; and only if the respective options are set. - ;; Perhaps, the setting could be more fine-grained. - ;; (process-put p 'tramp-shared-socket t) - ;; Set sentinel. Initialize variables. - (set-process-sentinel p #'tramp-process-sentinel) - (tramp-post-process-creation p vec) - (setq tramp-current-connection (cons vec (current-time))) + ;; Set sentinel and query flag. Initialize variables. + (set-process-sentinel p #'tramp-process-sentinel) + (process-put p 'tramp-vector vec) + ;; This is needed for ssh or PuTTY based processes, and + ;; only if the respective options are set. Perhaps, + ;; the setting could be more fine-grained. + ;; (process-put p 'tramp-shared-socket t) + (process-put p 'adjust-window-size-function #'ignore) + (set-process-query-on-exit-flag p nil) + (setq tramp-current-connection (cons vec (current-time))) ;; Set connection-local variables. (tramp-set-connection-local-variables vec) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 88cbfa2d88c..c16a399387e 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4942,10 +4942,7 @@ a connection-local variable." ;; t. See Bug#51177. (when filter (set-process-filter p filter)) - (tramp-post-process-creation p v) - ;; Query flag is overwritten in `tramp-post-process-creation', - ;; so we reset it. - (set-process-query-on-exit-flag p (null noquery)) + (process-put p 'tramp-vector v) ;; This is needed for ssh or PuTTY based processes, and ;; only if the respective options are set. Perhaps, the ;; setting could be more fine-grained. diff --git a/lisp/org/oc-biblatex.el b/lisp/org/oc-biblatex.el index b2d31f0f635..0ed5459a66d 100644 --- a/lisp/org/oc-biblatex.el +++ b/lisp/org/oc-biblatex.el @@ -26,7 +26,7 @@ ;; The processor relies on "biblatex" LaTeX package. As such it ensures that ;; the package is properly required in the document's preamble. More -;; accurately, it will re-use any "\usepackage{biblatex}" already present in +;; accurately, it will reuse any "\usepackage{biblatex}" already present in ;; the document (e.g., through `org-latex-packages-alist'), or insert one using ;; options defined in `org-cite-biblatex-options'. diff --git a/lisp/org/oc.el b/lisp/org/oc.el index 8a7b662098a..269f7fd13a1 100644 --- a/lisp/org/oc.el +++ b/lisp/org/oc.el @@ -52,7 +52,7 @@ ;; through the "cite_export" keyword. ;; Eventually, this library provides some tools, mainly targeted at -;; processor implementors. Most are export-specific and are located +;; processor implementers. Most are export-specific and are located ;; in the "Tools only available during export" and "Tools generating ;; or operating on parsed data" sections. diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el index a696c615b2a..41872ff87ef 100644 --- a/lisp/org/org-capture.el +++ b/lisp/org/org-capture.el @@ -1312,7 +1312,7 @@ may have been stored before." (while (< (point) end) (indent-to i) (forward-line))) - ;; Pre-pending an item could change the type of the list + ;; Prepending an item could change the type of the list ;; if there is a mismatch. In this situation, ;; prioritize the existing list. (when prepend? diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el index d5bf2191ae7..db5e9283bf5 100644 --- a/lisp/org/org-compat.el +++ b/lisp/org/org-compat.el @@ -141,7 +141,7 @@ Unibyte strings are converted to multibyte for comparison." Elements in COMPONENTS must be a string or nil. DIRECTORY or the non-final elements in COMPONENTS may or may not end with a slash -- if they don't end with a slash, a slash will be -inserted before contatenating." +inserted before concatenating." (save-match-data (mapconcat #'identity diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el index 0dd149762c4..c5c92838050 100644 --- a/lisp/org/org-element.el +++ b/lisp/org/org-element.el @@ -5484,7 +5484,7 @@ This variable is used to determine when re-parsing buffer is not going to slow down the command. If the commands end up modifying the cache, the worst case scenario is -performance drop. So, advicing these commands is safe. Yet, it is +performance drop. So, advising these commands is safe. Yet, it is better to remove the commands advised in such a way from this list.") (defmacro org-element--request-key (request) diff --git a/lisp/org/org-persist.el b/lisp/org/org-persist.el index 01078f4596d..dc9fe3a7103 100644 --- a/lisp/org/org-persist.el +++ b/lisp/org/org-persist.el @@ -111,7 +111,7 @@ ;; ;; Each collection is represented as a plist containing the following ;; properties: -;; - `:container' : list of data continers to be stored in single +;; - `:container' : list of data containers to be stored in single ;; file; ;; - `:persist-file': data file name; ;; - `:associated' : list of associated objects; @@ -253,7 +253,7 @@ The index is a list of plists. Each plist contains information about persistent data storage. Each plist contains the following properties: - - `:container' : list of data continers to be stored in single file + - `:container' : list of data containers to be stored in single file - `:persist-file': data file name - `:associated' : list of associated objects - `:last-access' : last date when the container has been read diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index aa819aa7d2f..d6b7086cddd 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el @@ -4894,7 +4894,7 @@ This function sets up the following dynamically scoped variables: (push (cons field v) org-table-local-parameters) (push (list field line col) org-table-named-field-locations)))))))))) - ;; Re-use existing markers when possible. + ;; Reuse existing markers when possible. (if (markerp org-table-current-begin-pos) (move-marker org-table-current-begin-pos (point)) (setq org-table-current-begin-pos (point-marker))) diff --git a/lisp/org/org.el b/lisp/org/org.el index 34c572a3f57..31915135efa 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -1230,7 +1230,7 @@ This applies to indirect buffers created with the commands Valid values are: current-window Display in the current window other-window Just display in another window. -dedicated-frame Create one new frame, and re-use it each time. +dedicated-frame Create one new frame, and reuse it each time. new-frame Make a new frame each time. Note that in this case previously-made indirect buffers are kept, and you need to kill these buffers yourself." @@ -4582,7 +4582,7 @@ is available. This option applies only if FILE is a URL." file) nil)) (error (if noerror - (message "Org could't download \"%s\": %s %S" file (car error) (cdr error)) + (message "Org couldn't download \"%s\": %s %S" file (car error) (cdr error)) (signal (car error) (cdr error))))) (funcall (if noerror #'message #'user-error) "The remote resource %S is considered unsafe, and will not be downloaded." diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el index 3b0814970ad..eba13934ede 100644 --- a/lisp/progmodes/c-ts-common.el +++ b/lisp/progmodes/c-ts-common.el @@ -116,7 +116,7 @@ non-whitespace characters of the current line." "Regexp pattern that matches a comment in C-like languages.") (defun c-ts-common--fill-paragraph (&optional arg) - "Fillling function for `c-ts-common'. + "Filling function for `c-ts-common'. ARG is passed to `fill-paragraph'." (interactive "*P") (save-restriction @@ -134,7 +134,7 @@ ARG is passed to `fill-paragraph'." t))) (defun c-ts-common--fill-block-comment (&optional arg) - "Fillling function for block comments. + "Filling function for block comments. ARG is passed to `fill-paragraph'. Assume point is in a block comment." (let* ((node (treesit-node-at (point))) diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index 51f60f70131..2279d00b7a1 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -1362,7 +1362,7 @@ recommended to enable `electric-pair-mode' with this mode." c-ts-mode-indent-style) :help "Show the name of the C/C++ indentation style for current buffer"] ["Set Comment Style" c-ts-mode-toggle-comment-style - :help "Toglle C/C++ comment style between block and line comments"]) + :help "Toggle C/C++ comment style between block and line comments"]) "--" ("Toggle..." ["SubWord Mode" subword-mode diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 9e441dbfcf7..5522c1afc55 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1789,7 +1789,7 @@ to a function that generates a unique name." ;; run compile with the default command line (defun recompile (&optional edit-command) "Re-compile the program including the current buffer. -If this is run in a Compilation mode buffer, re-use the arguments from the +If this is run in a Compilation mode buffer, reuse the arguments from the original use. Otherwise, recompile using `compile-command'. If the optional argument `edit-command' is non-nil, the command can be edited." (interactive "P") diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index ab624a08646..02185972bfe 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -1463,7 +1463,7 @@ function tests that property." (defun cperl-block-declaration-p () "Test whether the following ?\\{ opens a declaration block. -Returns the column where the declarating keyword is found, or nil +Returns the column where the declaring keyword is found, or nil if this isn't a declaration block. Declaration blocks are named subroutines, packages and the like. They start with a keyword and a name, to be followed by various descriptive items which are diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el index b8d811baf0d..16dfe0b4dd2 100644 --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el @@ -468,7 +468,7 @@ (scan-error (goto-char startpos) nil)) (not (or (nth 8 (parse-partial-sexp ;; Since we don't know if point is within - ;; the first or the scond arg, we have to + ;; the first or the second arg, we have to ;; start from the beginning. (if twoargs (1+ (nth 8 state)) (point)) limit nil nil state 'syntax-table)) @@ -514,7 +514,7 @@ (string-to-syntax "|e") (string-to-syntax "\"e"))) (forward-char 1) - ;; Re-use perl-syntax-propertize-special-constructs to handle the + ;; Reuse perl-syntax-propertize-special-constructs to handle the ;; second part (the first delimiter of second part can't be ;; preceded by "s" or "tr" or "y", so it will not be considered ;; as twoarg). diff --git a/lisp/progmodes/ruby-ts-mode.el b/lisp/progmodes/ruby-ts-mode.el index b339e2028ab..284880a0a36 100644 --- a/lisp/progmodes/ruby-ts-mode.el +++ b/lisp/progmodes/ruby-ts-mode.el @@ -601,7 +601,7 @@ a statement container is a node that matches ;; case expression: when, in_clause, and else are all ;; children of case. when and in_clause have pattern and - ;; body as fields. body has "then" and then the statemets. + ;; body as fields. body has "then" and then the statements. ;; i.e. the statements are not children of when but then. ;; But for the statements are children of else. ((match "when" "case") diff --git a/lisp/ses.el b/lisp/ses.el index 30bf33e47bf..23018403cda 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -2245,7 +2245,7 @@ Based on the current set of columns and `window-hscroll' position." ;; Redisplay and recalculation ;;---------------------------------------------------------------------------- (defun ses-jump-prefix (prefix-int) - "Convert an integer (unversal prefix) into a (ROW . COL). + "Convert an integer (universal prefix) into a (ROW . COL). Does it by numbering cells starting from 0 from top left to bottom right, going row by row." (and (>= prefix-int 0) diff --git a/lisp/simple.el b/lisp/simple.el index 1d2ff92440c..bdd8a6b1635 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -8773,7 +8773,7 @@ node `(elisp) Word Motion' for details." (defun mark-word (&optional arg allow-extend) "Set mark ARG words from point or move mark one word. -When called from Lisp with ALLOW-EXTEND ommitted or nil, mark is +When called from Lisp with ALLOW-EXTEND omitted or nil, mark is set ARG words from point. With ARG and ALLOW-EXTEND both non-nil (interactively, with prefix argument), the place to which mark goes is the same place \\[forward-word] diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 3d6907cbec1..04c1946358d 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -714,7 +714,7 @@ Optional arg REVISION is a revision to annotate from." (insert insn) (delete-char insn))) ;; Now apply the forward-chronological edits (directly from the - ;; parse-tree) for the branch(es), if necessary. We re-use vars + ;; parse-tree) for the branch(es), if necessary. We reuse vars ;; `pre' and `meta' for the sake of internal func `r/d/a'. (while nbls (setq pre (cdr (pop nbls))) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 3085e4b9f76..958929fe4c6 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -668,7 +668,7 @@ ;;;; New Primitives: ;; ;; - uncommit: undo last checkin, leave changes in place in the workfile, -;; stash the commit comment for re-use. +;; stash the commit comment for reuse. ;; ;; - deal with push operations. ;; diff --git a/src/conf_post.h b/src/conf_post.h index f31e012dc6e..43ec5265ec6 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -96,7 +96,7 @@ typedef bool bool_bf; #ifdef emacs /* We include stdlib.h here, because Gnulib's stdlib.h might redirect 'free' to its replacement, and we want to avoid that in unexec - builds. Inclduing it here will render its inclusion after config.h + builds. Including it here will render its inclusion after config.h a no-op. */ # if (defined DARWIN_OS && defined HAVE_UNEXEC) || defined HYBRID_MALLOC # include diff --git a/src/image.c b/src/image.c index 9c0f5f0fb37..29ec6d5381b 100644 --- a/src/image.c +++ b/src/image.c @@ -12053,7 +12053,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents, } #if HAVE_NTGUI - /* Windows stores the image colours in BGR format, and SVG expects + /* Windows stores the image colors in BGR format, and SVG expects them in RGB. */ foreground = (foreground & 0x0000FF) << 16 | (foreground & 0xFF0000) >> 16 diff --git a/src/itree.c b/src/itree.c index 259cc99d3af..5aefea528f5 100644 --- a/src/itree.c +++ b/src/itree.c @@ -74,7 +74,7 @@ along with GNU Emacs. If not, see . */ Consider the case where next-overlay-change is called at POS, all interval BEG positions are less than pos POS and all interval END - posistions are after. These END positions have no order, and so + positions are after. These END positions have no order, and so *every* interval must be examined. This is at least O(N). The previous-overlay-change case is similar. The root issue is that the iterative "narrowing" approach is not guaranteed to reduce the diff --git a/src/tparam.c b/src/tparam.c index a0d2ee74d99..84a063e9307 100644 --- a/src/tparam.c +++ b/src/tparam.c @@ -183,7 +183,7 @@ tparam1 (const char *string, char *outstring, int len, argp++; break; - case 'b': /* %b means back up one arg (and re-use it). */ + case 'b': /* %b means back up one arg (and reuse it). */ argp--; break; diff --git a/src/window.c b/src/window.c index e802ffb3fe2..3d18d48bfb7 100644 --- a/src/window.c +++ b/src/window.c @@ -526,7 +526,7 @@ select_window (Lisp_Object window, Lisp_Object norecord, /* Do not select a tooltip window (Bug#47207). */ error ("Cannot select a tooltip window"); - /* We deinitely want to select WINDOW, not the mini-window. */ + /* We definitely want to select WINDOW, not the mini-window. */ f->select_mini_window_flag = false; /* Make the selected window's buffer current. */ diff --git a/src/xfont.c b/src/xfont.c index ce32c7a2188..fdadb05500a 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -238,7 +238,7 @@ xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont, static Lisp_Object xfont_scripts_cache; -/* Re-usable vector to store characteristic font properties. */ +/* Reusable vector to store characteristic font properties. */ static Lisp_Object xfont_scratch_props; /* Return a list of scripts supported by the font of FONTNAME whose diff --git a/src/xterm.c b/src/xterm.c index d01c4da0564..75ac8d0d555 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -12564,7 +12564,7 @@ x_dnd_process_quit (struct frame *f, Time timestamp) /* This function is defined far away from the rest of the XDND code so it can utilize `x_any_window_to_frame'. */ -/* Implementors beware! On most other platforms (where drag-and-drop +/* Implementers beware! On most other platforms (where drag-and-drop data is not provided via selections, but some kind of serialization mechanism), it is usually much easier to implement a suitable primitive instead of copying the C code here, and then to build diff --git a/test/lisp/international/mule-tests.el b/test/lisp/international/mule-tests.el index 4dc099a18af..c973955e4ce 100644 --- a/test/lisp/international/mule-tests.el +++ b/test/lisp/international/mule-tests.el @@ -49,7 +49,7 @@ (kbd "C-x RET c u t f - 8 RET C-u C-u c a b RET") (read-string "prompt:")))))) -;;Bug#65997, ensure that old-names haven't overriden new names. +;;Bug#65997, ensure that old-names haven't overridden new names. (ert-deftest mule-cmds-tests--ucs-names-old-name-override () (let (code-points) (dotimes (u (1+ (max-char 'ucs))) diff --git a/test/lisp/progmodes/perl-mode-tests.el b/test/lisp/progmodes/perl-mode-tests.el index a47a6722e20..3b22c5d8750 100644 --- a/test/lisp/progmodes/perl-mode-tests.el +++ b/test/lisp/progmodes/perl-mode-tests.el @@ -28,24 +28,7 @@ (font-lock-ensure (point-min) (point-max)) (should (equal (get-text-property 4 'face) 'font-lock-variable-name-face)))) -(ert-deftest perl-test-bug-34245 () - "Test correct indentation after a hanging paren, with and without comments." - (with-temp-buffer - (perl-mode) - (insert "my @foo = (\n\"bar\",\n\"baz\",\n);") - (insert "\n\n") - (insert "my @ofoo = (\t\t# A comment.\n\"obar\",\n\"obaz\",\n);") - (indent-region (point-min) (point-max)) - (goto-char (point-min)) - (forward-line) - (skip-chars-forward " \t") - (should (equal (current-column) perl-indent-level)) - (search-forward "# A comment.") - (forward-line) - (skip-chars-forward " \t") - (should (equal (current-column) perl-indent-level)))) - -;;;; Re-use cperl-mode tests +;;;; Reuse cperl-mode tests (defvar cperl-test-mode) (setq cperl-test-mode #'perl-mode)