emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 3d7d8ddc5a: ; Fix typos


From: Stefan Kangas
Subject: master 3d7d8ddc5a: ; Fix typos
Date: Mon, 8 Aug 2022 08:23:48 -0400 (EDT)

branch: master
commit 3d7d8ddc5ac73ebeb4aff9e672e649c8352beeb2
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    ; Fix typos
---
 doc/lispref/commands.texi                       | 2 +-
 doc/misc/modus-themes.org                       | 4 ++--
 etc/themes/modus-themes.el                      | 2 +-
 lisp/ChangeLog.12                               | 2 +-
 lisp/emacs-lisp/warnings.el                     | 2 +-
 lisp/help-fns.el                                | 2 +-
 lisp/x-dnd.el                                   | 2 +-
 src/xterm.c                                     | 6 +++---
 test/lisp/erc/resources/erc-scenarios-common.el | 4 ++--
 test/lisp/net/tramp-tests.el                    | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index a8ce294ad9..26739bf5b8 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -2704,7 +2704,7 @@ Return the timestamp in @var{position}.  This is the time 
at which the
 event occurred, in milliseconds.  Such a timestamp is reported
 relative to an arbitrary starting time that varies according to the
 window system in use.  On the X Window System, for example, it is the
-number of miliseconds since the X server was started.
+number of milliseconds since the X server was started.
 @end defun
 
   These functions compute a position list given particular buffer
diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index a80bf6be8a..ddd9595fc8 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -1253,7 +1253,7 @@ accepts is as follows (order is not significant):
 
 The ~popup~ key takes the same values as ~selection~.
 
-Apart from specfying each key separately, a fallback list is accepted.
+Apart from specifying each key separately, a fallback list is accepted.
 This is only useful when the desired aesthetic is the same across all
 keys that are not explicitly referenced.  For example, this:
 
@@ -3639,7 +3639,7 @@ it if you plan to control face attributes.
 :end:
 #+cindex: Org custom emphasis faces
 
-Org provides the user option ~org-emphasis-alist~ which assosiates a
+Org provides the user option ~org-emphasis-alist~ which associates a
 character with a face, list of faces, or face attributes.  The default
 specification of that variable looks like this:
 
diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el
index 54e5e465b1..e64a11b74f 100644
--- a/etc/themes/modus-themes.el
+++ b/etc/themes/modus-themes.el
@@ -2270,7 +2270,7 @@ follows (order is not significant):
 
 The `popup' key takes the same values as `selection'.
 
-Apart from specfying each key separately, a fallback list is
+Apart from specifying each key separately, a fallback list is
 accepted.  This is only useful when the desired aesthetic is the
 same across all keys that are not explicitly referenced.  For
 example, this:
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index c45c8ae735..a89e515510 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -14359,7 +14359,7 @@
        * ldefs-boot.el: Likewise.
 
        * textmodes/bibtex.el (bibtex-validate-globally): Fix typo in a
-       message text: "Duplicat" => "Duplicate".
+       message text.
 
 2006-01-06  Sven Joachim  <svenjoac@gmx.de>  (tiny change)
 
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index 516fdeb10e..d60eedbc9c 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -209,7 +209,7 @@ SUPPRESS-LIST is the list of kinds of warnings to suppress."
     (text " stop "))
   "Suppress warnings."
   :version "29.1"
-  :help-echo "Click to supress this warning type")
+  :help-echo "Click to suppress this warning type")
 
 (defun warnings-suppress (type)
   (pcase (car
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 768023b54c..59a509b221 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -799,7 +799,7 @@ the C sources, too."
     ;; different purposes, such as function name, var name, face name,
     ;; property name, ...).
     (concat
-     ;; The main "canonical" occurence of symbols is within '...'.
+     ;; The main "canonical" occurrence of symbols is within '...'.
      "'" quoted "'"
      ;; Commands can also occur as `M-x blabla'.
      "\\|M-x[ \t\n]+" quoted "\\_>"
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index bdfe444bc1..2bda67fe3f 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -1480,7 +1480,7 @@ instead of returning \"E\".")
           (error '(STRING . "E")))))))
 
 (defun x-dnd-handle-octet-stream (_selection _type _value)
-  "Handle a selecton request for `application/octet-stream'.
+  "Handle a selection request for `application/octet-stream'.
 Return the contents of the XDS file."
   (cons 'application/octet-stream
         (ignore-errors
diff --git a/src/xterm.c b/src/xterm.c
index 23a35aa161..36797bc0ab 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6837,7 +6837,7 @@ x_sync_trigger_fence (struct frame *f, XSyncValue value)
   idx = (n / 4) % 2;
 
 #ifdef FRAME_DEBUG
-  fprintf (stderr, "Triggering synchonization fence: %lu\n", idx);
+  fprintf (stderr, "Triggering synchronization fence: %lu\n", idx);
 #endif
 
   XSyncTriggerFence (FRAME_X_DISPLAY (f),
@@ -18928,7 +18928,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
         {
          /* Now clear dpyinfo->last_mouse_motion_frame, or
             gui_redo_mouse_highlight will end up highlighting the
-            last known poisition of the mouse if a tooltip frame is
+            last known position of the mouse if a tooltip frame is
             later unmapped.  */
 
          if (f == dpyinfo->last_mouse_motion_frame)
@@ -20397,7 +20397,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                {
                  /* Now clear dpyinfo->last_mouse_motion_frame, or
                     gui_redo_mouse_highlight will end up highlighting
-                    the last known poisition of the mouse if a
+                    the last known position of the mouse if a
                     tooltip frame is later unmapped.  */
 
                  if (f == dpyinfo->last_mouse_motion_frame)
diff --git a/test/lisp/erc/resources/erc-scenarios-common.el 
b/test/lisp/erc/resources/erc-scenarios-common.el
index cbabfcd26b..bc2cb68cd8 100644
--- a/test/lisp/erc/resources/erc-scenarios-common.el
+++ b/test/lisp/erc/resources/erc-scenarios-common.el
@@ -142,10 +142,10 @@ Dialog resource directories are located by expanding the 
variable
   (declare (indent 1))
 
   (let* ((orig-autojoin-mode (make-symbol "orig-autojoin-mode"))
-         (combind `((,orig-autojoin-mode (bound-and-true-p erc-autojoin-mode))
+         (combined `((,orig-autojoin-mode (bound-and-true-p erc-autojoin-mode))
                     ,@(erc-scenarios-common--make-bindings bindings))))
 
-    `(erc-d-t-with-cleanup (,@combind)
+    `(erc-d-t-with-cleanup (,@combined)
 
          (ert-info ("Restore autojoin, etc., kill ERC buffers")
            (dolist (buf (buffer-list))
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index e2cafc240b..a3e80e8956 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2481,7 +2481,7 @@ This checks also `file-name-as-directory', 
`file-name-directory',
              (insert-file-contents tmp-name)
              (should (string-equal (buffer-string) "foo")))
 
-           ;; Write empty string.  Used for creation of temprorary files.
+           ;; Write empty string.  Used for creation of temporary files.
            ;; Since Emacs 27.1.
            (when (fboundp 'make-empty-file)
              (with-no-warnings



reply via email to

[Prev in Thread] Current Thread [Next in Thread]