emacs-diffs
[Top][All Lists]
Advanced

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

master 09674074b5: ; Fix typos


From: Stefan Kangas
Subject: master 09674074b5: ; Fix typos
Date: Sun, 15 May 2022 05:18:19 -0400 (EDT)

branch: master
commit 09674074b57bee74ff1039f8ef08c2dea321c0da
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    ; Fix typos
---
 config.bat                    | 2 +-
 lisp/emacs-lisp/shortdoc.el   | 2 +-
 lisp/eshell/esh-opt.el        | 2 +-
 lisp/image/image-converter.el | 2 +-
 lisp/international/mule.el    | 2 +-
 lisp/net/eww.el               | 2 +-
 lisp/progmodes/cc-engine.el   | 2 +-
 lisp/progmodes/erts-mode.el   | 6 +++---
 lisp/progmodes/sql.el         | 2 +-
 lisp/replace.el               | 2 +-
 lisp/x-dnd.el                 | 2 +-
 lisp/xwidget.el               | 2 +-
 src/haiku_support.cc          | 2 +-
 src/haikuterm.c               | 2 +-
 src/image.c                   | 2 +-
 src/lread.c                   | 2 +-
 src/pgtkfns.c                 | 4 ++--
 src/pgtkterm.c                | 2 +-
 src/pgtkterm.h                | 2 +-
 src/sort.c                    | 2 +-
 src/w32term.c                 | 2 +-
 src/xterm.c                   | 8 ++++----
 test/lisp/ansi-color-tests.el | 2 +-
 test/lisp/files-tests.el      | 2 +-
 test/lisp/net/tramp-tests.el  | 4 ++--
 25 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/config.bat b/config.bat
index 758e462138..e9a180c8ee 100644
--- a/config.bat
+++ b/config.bat
@@ -310,7 +310,7 @@ rm -f makefile.tmp
 sed -f ../msdos/sedlibcf.inp < gnulib.mk-in > gnulib.tmp
 sed -f ../msdos/sedlibmk.inp < gnulib.tmp > gnulib.mk
 rm -f gnulib.tmp
-Rem Create directorys in lib/ that MKDIR_P is supposed to create
+Rem Create directories in lib/ that MKDIR_P is supposed to create
 Rem but I have no idea how to do that on MS-DOS.
 mkdir sys
 Rem Create .d files for new files in lib/ and lib/malloc/
diff --git a/lisp/emacs-lisp/shortdoc.el b/lisp/emacs-lisp/shortdoc.el
index 340fe766c1..4c8ca967f1 100644
--- a/lisp/emacs-lisp/shortdoc.el
+++ b/lisp/emacs-lisp/shortdoc.el
@@ -83,7 +83,7 @@ together:
 If EVAL is a string, it will be inserted as is, and then that
 string will be `read' and evaluated.
 
-2. Document a form or string, but manually document its evalation
+2. Document a form or string, but manually document its evaluation
    result.  The provided form will not be evaluated.
 
   (FUNC
diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index 0961e214f4..f52b70fe7a 100644
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -205,7 +205,7 @@ a long option."
 VALUE is the potential value of the OPT, coming from args like
 \"-fVALUE\" or \"--foo=VALUE\", or nil if no value was supplied.  If
 OPT doesn't consume a value, return VALUE unchanged so that it can be
-processed later; otherwsie, return nil.
+processed later; otherwise, return nil.
 
 If the OPT consumes an argument for its value and VALUE is nil, the
 argument list will be modified."
diff --git a/lisp/image/image-converter.el b/lisp/image/image-converter.el
index 7914d28c29..9440c623f9 100644
--- a/lisp/image/image-converter.el
+++ b/lisp/image/image-converter.el
@@ -49,7 +49,7 @@ formats that are to be supported: Only the suffixes that map 
to
 (defcustom image-convert-to-format "png"
   "The image format to convert to.
 This should be a string like \"png\" or \"ppm\" or some
-other (preferrably lossless) format that Emacs understands
+other (preferably lossless) format that Emacs understands
 natively.  The converter chosen has to support the format, and if
 not, conversion will fail."
   :group 'image
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 1596cdb481..ab74c2cffd 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -310,7 +310,7 @@ Print messages at start and end of loading unless optional 
fourth
 arg NOMESSAGE is non-nil.
 
 If EVAL-FUNCTION, call that instead of calling `eval-buffer'
-directly.  It is called with two paramameters: The buffer object
+directly.  It is called with two parameters: The buffer object
 and the file name.
 
 Return t if file exists."
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 57cb566c95..21f6e33b0d 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -1855,7 +1855,7 @@ The browser to used is specified by the
   (replace-regexp-in-string ".utm_.*" "" url))
 
 (defun eww--transform-url (url)
-  "Appy `eww-url-transformers'."
+  "Apply `eww-url-transformers'."
   (when url
     (dolist (func eww-url-transformers)
       (setq url (funcall func url)))
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index ae68bf989a..2a9a7a8bf5 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -6848,7 +6848,7 @@ comment at the start of cc-engine.el for more info."
   ;; checking `c-new-id-start' and `c-new-id-end'.  That's done to avoid
   ;; adding all prefixes of a type as it's being entered and font locked.
   ;; This is a bit rough and ready, but now covers adding characters into the
-  ;; middle of an identifer.
+  ;; middle of an identifier.
   ;;
   ;; This function might do hidden buffer changes.
   (if (and c-new-id-start c-new-id-end
diff --git a/lisp/progmodes/erts-mode.el b/lisp/progmodes/erts-mode.el
index 31a8bded8a..1b88540ff3 100644
--- a/lisp/progmodes/erts-mode.el
+++ b/lisp/progmodes/erts-mode.el
@@ -51,17 +51,17 @@
      :foreground "blue")
     (t
      :bold t))
-  "Face used for displaying specificaton values."
+  "Face used for displaying specification values."
   :group 'erts-mode)
 
 (defface erts-mode-start-test
   '((t :inherit font-lock-keyword-face))
-  "Face used for displaying specificaton test start markers."
+  "Face used for displaying specification test start markers."
   :group 'erts-mode)
 
 (defface erts-mode-end-test
   '((t :inherit font-lock-comment-face))
-  "Face used for displaying specificaton test start markers."
+  "Face used for displaying specification test start markers."
   :group 'erts-mode)
 
 (defvar erts-mode-map
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 979b743a65..7bb4fef0c0 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -4179,7 +4179,7 @@ must tell Emacs.  Here's how to do that in your init file:
                      ;; start a comment.
                     (string-to-syntax ".")
                    ;; Inside a comment, ignore it to avoid -*/ not
-                   ;; being intepreted as a comment end.
+                   ;; being interpreted as a comment end.
                    (forward-char -1)
                    nil)))))
   ;; Set syntax and font-face highlighting
diff --git a/lisp/replace.el b/lisp/replace.el
index 81282deb14..3d0877a9a6 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2684,7 +2684,7 @@ It is called with three arguments, as if it were
   "Function to convert the FROM string of query-replace commands to a regexp.
 This is used by `query-replace', `query-replace-regexp', etc. as
 the value of `isearch-regexp-function' when they search for the
-occurences of the string/regexp to be replaced.  This is intended
+occurrences of the string/regexp to be replaced.  This is intended
 to be used when the string to be replaced, as typed by the user,
 is not to be interpreted literally, but instead should be converted
 to a regexp that is actually used for the search.")
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 13a73aa7fb..f3abb9d5e6 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -784,7 +784,7 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an 
XClientMessageEvent."
 ;;; Handling drops.
 
 (defun x-dnd-handle-unsupported-drop (targets _x _y action _window-id _frame 
_time)
-  "Return non-nil if the drop described by TARGETS and ACTION should not 
proceeed."
+  "Return non-nil if the drop described by TARGETS and ACTION should not 
proceed."
   (not (and (or (eq action 'XdndActionCopy)
                 (eq action 'XdndActionMove))
             (or (member "STRING" targets)
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 62da16d486..88bc8ff6c5 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -451,7 +451,7 @@ XWIDGET instance, XWIDGET-EVENT-TYPE depends on the 
originating xwidget."
                          xwidget-webkit--progress-update-timer
                          (run-at-time 0.5 0.5 
#'xwidget-webkit--update-progress-timer-function
                                       xwidget)))))
-             ;; This funciton will be called multi times, so only
+             ;; This function will be called multi times, so only
              ;; change buffer name when the load actually completes
              ;; this can limit buffer-name flicker in mode-line.
              (when (or (string-equal (nth 3 last-input-event)
diff --git a/src/haiku_support.cc b/src/haiku_support.cc
index ac2f4f39ea..2143f14dc9 100644
--- a/src/haiku_support.cc
+++ b/src/haiku_support.cc
@@ -143,7 +143,7 @@ struct font_selection_dialog_message
   /* Whether or not font selection was cancelled.  */
   bool_bf cancel : 1;
 
-  /* Whether or not a size was explictly specified.  */
+  /* Whether or not a size was explicitly specified.  */
   bool_bf size_specified : 1;
 
   /* The index of the selected font family.  */
diff --git a/src/haikuterm.c b/src/haikuterm.c
index 57f5b052f6..df0cd82a39 100644
--- a/src/haikuterm.c
+++ b/src/haikuterm.c
@@ -3036,7 +3036,7 @@ haiku_flush_dirty_back_buffer_on (struct frame *f)
     haiku_flip_buffers (f);
 }
 
-/* N.B. that support for TYPE must be explictly added to
+/* N.B. that support for TYPE must be explicitly added to
    haiku_read_socket.  */
 void
 haiku_wait_for_event (struct frame *f, int type)
diff --git a/src/image.c b/src/image.c
index dfa5327992..18e9e72d83 100644
--- a/src/image.c
+++ b/src/image.c
@@ -9108,7 +9108,7 @@ gif_load (struct frame *f, struct image *img)
       goto gif_error;
     }
 
-  /* It's an animated image, so initalize the cache.  */
+  /* It's an animated image, so initialize the cache.  */
   if (cache && !cache->handle)
     {
       cache->handle = gif;
diff --git a/src/lread.c b/src/lread.c
index 2538851bac..409e97cdfa 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3497,7 +3497,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool 
first_in_list, bool locate_syms)
 
                          /* Optimisation: since the placeholder is already
                             a cons, repurpose it as the actual value.
-                            This allows us to skip the substition below,
+                            This allows us to skip the substitution below,
                             since the placeholder is already referenced
                             inside TEM at the appropriate places.  */
                           Fsetcar (placeholder, XCAR (tem));
diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index a0fcf70f31..1feb3fe250 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -848,7 +848,7 @@ pgtk_set_scroll_bar_background (struct frame *f, 
Lisp_Object new_value,
        error ("Unknown color.");
 
       /* On pgtk, this frame parameter should be ignored, and honor
-        gtk theme.  (It honors the GTK theme if not explictly set, so
+        gtk theme.  (It honors the GTK theme if not explicitly set, so
         I see no harm in letting users tinker a bit more.)  */
       char css[64];
       sprintf (css, "scrollbar trough { background-color: #%06x; }",
@@ -2853,7 +2853,7 @@ x_create_tip_frame (struct pgtk_display_info *dpyinfo, 
Lisp_Object parms, struct
      Frame parameters may be changed if .Xdefaults contains
      specifications for the default font.  For example, if there is an
      `Emacs.default.attributeBackground: pink', the `background-color'
-     attribute of the frame get's set, which let's the internal border
+     attribute of the frame gets set, which lets the internal border
      of the tooltip frame appear in pink.  Prevent this.  */
   {
     Lisp_Object bg = Fframe_parameter (frame, Qbackground_color);
diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 11ab40a0d3..b9d0b7b512 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -2551,7 +2551,7 @@ pgtk_draw_glyph_string (struct glyph_string *s)
                    }
 
                  /* Ignore minimum_offset if the amount of pixels was
-                    explictly specified.  */
+                    explicitly specified.  */
                  if (!s->face->underline_pixels_above_descent_line)
                    position = max (position, underline_minimum_offset);
                }
diff --git a/src/pgtkterm.h b/src/pgtkterm.h
index 20c161e63b..e31e62ae19 100644
--- a/src/pgtkterm.h
+++ b/src/pgtkterm.h
@@ -96,7 +96,7 @@ struct scroll_bar
      editing large files, we establish a minimum height by always
      drawing handle bottoms VERTICAL_SCROLL_BAR_MIN_HANDLE pixels below
      where they would be normally; the bottom and top are in a
-     different co-ordinate system.  */
+     different coordinate system.  */
   int start, end;
 
   /* If the scroll bar handle is currently being dragged by the user,
diff --git a/src/sort.c b/src/sort.c
index c7ccfc2305..d10ae692d3 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -783,7 +783,7 @@ merge_at (merge_state *ms, const ptrdiff_t i)
 }
 
 
-/* Compute the "power" of the first of two adjacent runs begining at
+/* Compute the "power" of the first of two adjacent runs beginning at
    index S1, with the first having length N1 and the second (starting
    at index S1+N1) having length N2.  The run has total length N.  */
 
diff --git a/src/w32term.c b/src/w32term.c
index 19786da3a6..da7ac37972 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2720,7 +2720,7 @@ w32_draw_glyph_string (struct glyph_string *s)
 
                  if (!(s->face->underline_at_descent_line_p
                        /* Ignore minimum_offset if the amount of pixels
-                          was explictly specified.  */
+                          was explicitly specified.  */
                        && s->face->underline_pixels_above_descent_line))
                    position = max (position, minimum_offset);
                 }
diff --git a/src/xterm.c b/src/xterm.c
index bb92e1bbe6..21c31271ca 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -78,7 +78,7 @@ along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>.  */
    INPUT FOCUS
 
    Under X, the window where keyboard input is sent is not always
-   explictly defined.  When there is a focus window, it receives what
+   explicitly defined.  When there is a focus window, it receives what
    is referred to as "explicit focus", but when there is none, it
    receives "implicit focus" whenever the pointer enters it, and loses
    that focus when the pointer leaves.  When the toplevel window of a
@@ -2515,7 +2515,7 @@ x_dnd_compute_toplevels (struct x_display_info *dpyinfo)
            }
 
          /* And the common case where there is no input rect and the
-            bouding rect equals the window dimensions.  */
+            bounding rect equals the window dimensions.  */
 
          if (tem->n_input_rects == -1
              && tem->n_bounding_rects == 1
@@ -8781,7 +8781,7 @@ x_draw_glyph_string (struct glyph_string *s)
                     }
 
                  /* Ignore minimum_offset if the amount of pixels was
-                    explictly specified.  */
+                    explicitly specified.  */
                  if (!s->face->underline_pixels_above_descent_line)
                    position = max (position, minimum_offset);
                 }
@@ -19973,7 +19973,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                    }
 
                  /* And the common case where there is no input rect and the
-                    bouding rect equals the window dimensions.  */
+                    bounding rect equals the window dimensions.  */
 
                  if (tem->n_input_rects == -1
                      && tem->n_bounding_rects == 1
diff --git a/test/lisp/ansi-color-tests.el b/test/lisp/ansi-color-tests.el
index 2ff7fc6aaf..1b04e8e9de 100644
--- a/test/lisp/ansi-color-tests.el
+++ b/test/lisp/ansi-color-tests.el
@@ -173,7 +173,7 @@ strings with `eq', this function compares them with 
`equal'."
       (should (ansi-color-tests-equal-props
                propertized-str (buffer-string))))
 
-    ;; \e not followed by '[' and invalid ANSI escape seqences
+    ;; \e not followed by '[' and invalid ANSI escape sequences
     (dolist (fun (list ansi-filt ansi-app))
       (with-temp-buffer
         (should (equal (funcall fun "\e") ""))
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index 7d17fbde67..978f96912f 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -1691,7 +1691,7 @@ FN-TEST is the function to test: either 
`save-some-buffers' or
 specified inside ARGS-RESULTS.
 
 During the call to FN-TEST,`read-event' is overridden with a function that
-just returns `n' and `kill-emacs' is overriden to do nothing.
+just returns `n' and `kill-emacs' is overridden to do nothing.
 
 ARGS-RESULTS is a list of elements (FN-ARGS CALLERS-DIR EXPECTED), where
 FN-ARGS are the arguments for FN-TEST;
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index fa5a614fbf..d9c5df1790 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -6461,7 +6461,7 @@ This requires restrictions of file name syntax."
 
 (defun tramp--test-asynchronous-processes-p ()
   "Whether asynchronous processes tests are run.
-This is used in tests which we dont't want to tag
+This is used in tests which we don't want to tag
 `:tramp-asynchronous-processes' completely."
   (and
    (ert-select-tests
@@ -6484,7 +6484,7 @@ This does not support some special file names."
 
 (defun tramp--test-expensive-test-p ()
   "Whether expensive tests are run.
-This is used in tests which we dont't want to tag `:expensive'
+This is used in tests which we don't want to tag `:expensive'
 completely."
   (ert-select-tests
    (ert--stats-selector ert--current-run-stats)



reply via email to

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