diff options
| -rw-r--r-- | doc/lispref/frames.texi | 4 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsWindow.java | 2 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 2 | ||||
| -rw-r--r-- | lisp/eshell/em-unix.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/hideif.el | 2 | ||||
| -rw-r--r-- | lisp/transient.el | 2 | ||||
| -rw-r--r-- | src/sfnt.c | 4 | ||||
| -rw-r--r-- | src/treesit.c | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index f09ee0afbf4..f6f9e56e0c7 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -4514,7 +4514,7 @@ bounds of the selection data in the buffer @var{buf}. Selections under such window systems as MS-Windows, Nextstep, Haiku and Android are not aligned with those under X@. Each of these window system improvises its own selection mechanism without employing the -``selection converter'' mechanism illustrated in the preceeding node. +``selection converter'' mechanism illustrated in the preceding node. Only the @code{PRIMARY}, @code{CLIPBOARD}, and @code{SECONDARY} selections are generally supported, with the @code{XdndSelection} selection that records drag-and-drop data also available under @@ -4852,7 +4852,7 @@ is the selection data itself (@pxref{Accessing Selections}). sometimes distinct from those provided by the ICCCM and conforming clipboard or primary selection owners. Frequently, the name of a MIME type, such as @code{"text/plain;charset=utf-8"} (with discrepant -capitalization of the ``utf-8''), is substitued for a standard X +capitalization of the ``utf-8''), is substituted for a standard X selection name such as @code{UTF8_STRING}. @cindex XDS diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java index 2c446913eba..3c9e6eb215f 100644 --- a/java/org/gnu/emacs/EmacsWindow.java +++ b/java/org/gnu/emacs/EmacsWindow.java @@ -428,7 +428,7 @@ public final class EmacsWindow extends EmacsHandleObject manager = EmacsWindowAttachmentManager.MANAGER; /* If parent is the root window, notice that there are new - children available for interested activites to pick + children available for interested activities to pick up. */ manager.registerWindow (EmacsWindow.this); diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 616129bf780..62fdc0ad6e8 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2189,7 +2189,7 @@ removed from the list will be disabled." move-to-prompt) (const :tag "netsplit: Detect netsplits" netsplit) (const :tag "networks: Provide data about IRC networks" networks) - (const :tag "nickbar: Show nicknames in a dyamic side window" nickbar) + (const :tag "nickbar: Show nicknames in a dynamic side window" nickbar) (const :tag "nicks: Uniquely colorize nicknames in target buffers" nicks) (const :tag "noncommands: Deprecated. See module `command-indicator'." noncommands) diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el index 509b2d31819..67e5bda021b 100644 --- a/lisp/eshell/em-unix.el +++ b/lisp/eshell/em-unix.el @@ -92,7 +92,7 @@ Otherwise, `rmdir' is required." :group 'eshell-unix) (define-widget 'eshell-interactive-query 'radio - "When to interatively query the user about a particular operation. + "When to interactively query the user about a particular operation. If t, always query. If nil, never query. If `root', query when the user is logged in as root (including when `default-directory' is remote with a root user)." diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 660b5f53a5f..a7ead1f2997 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1239,7 +1239,7 @@ Operations not mentioned here will be handled by the normal Emacs functions.") (with-current-buffer (tramp-get-connection-buffer v) (goto-char (point-min)) (tramp-set-file-property v localname "file-symlink-marker" (read (current-buffer))) - ;; We cannote call `read', the file name isn't quoted. + ;; We cannot call `read', the file name isn't quoted. (forward-line) (buffer-substring (point) (line-end-position)))) diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 836db83c2f3..e913d37371a 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -1801,7 +1801,7 @@ and `+='...)." actual-parms nil))) (t - (error "Interal error: impossible case.")))) + (error "Internal error: impossible case")))) (pop actual-parms) while actual-parms) ; end cl-loop diff --git a/lisp/transient.el b/lisp/transient.el index ebf6f23f6cd..93c68f8162b 100644 --- a/lisp/transient.el +++ b/lisp/transient.el @@ -3566,7 +3566,7 @@ have a history of their own.") (propertize "\n" 'face face 'line-height t)))) (defmacro transient-with-shadowed-buffer (&rest body) - "While in the transient buffer, temporarly make the shadowed buffer current." + "While in the transient buffer, temporarily make the shadowed buffer current." (declare (indent 0) (debug t)) `(with-current-buffer (or transient--shadowed-buffer (current-buffer)) ,@body)) diff --git a/src/sfnt.c b/src/sfnt.c index 238e7f48420..44906b12ce9 100644 --- a/src/sfnt.c +++ b/src/sfnt.c @@ -2783,7 +2783,7 @@ sfnt_decompose_compound_glyph (struct sfnt_glyph *glyph, else { /* The offset is determined by matching a point location in - a preceeding component with a point location in the + a preceding component with a point location in the current component. The index of the point in the previous component can be determined by adding component->argument1.a or component->argument1.c to @@ -11880,7 +11880,7 @@ sfnt_interpret_compound_glyph_1 (struct sfnt_glyph *glyph, else { /* The offset is determined by matching a point location in - a preceeding component with a point location in the + a preceding component with a point location in the current component. The index of the point in the previous component is established by adding component->argument1.a or component->argument1.c to diff --git a/src/treesit.c b/src/treesit.c index 912f4ed47cc..b8de95ec691 100644 --- a/src/treesit.c +++ b/src/treesit.c @@ -3286,7 +3286,7 @@ treesit_traverse_get_predicate (Lisp_Object thing, Lisp_Object language) there's an error, set SIGNAL_DATA to (ERR . DATA), where ERR is an error symbol, and DATA is something signal accepts, and return false, otherwise return true. This function also check for - recusion levels: we place a arbitrary 100 level limit on recursive + recursion levels: we place a arbitrary 100 level limit on recursive predicates. RECURSION_LEVEL is the current recursion level (that starts at 0), if it goes over 99, return false and set SIGNAL_DATA. LANGUAGE is a LANGUAGE symbol. */ |