diff options
| author | Stefan Kangas | 2022-08-08 14:08:47 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2022-08-08 14:23:29 +0200 |
| commit | 3d7d8ddc5ac73ebeb4aff9e672e649c8352beeb2 (patch) | |
| tree | 6d42cf8c36051aa9d8369cb0ac900b8709b20f5f | |
| parent | cf30432a14b935726cd0845ae490bdd5b94625ab (diff) | |
| download | emacs-3d7d8ddc5ac73ebeb4aff9e672e649c8352beeb2.tar.gz emacs-3d7d8ddc5ac73ebeb4aff9e672e649c8352beeb2.zip | |
; Fix typos
| -rw-r--r-- | doc/lispref/commands.texi | 2 | ||||
| -rw-r--r-- | doc/misc/modus-themes.org | 4 | ||||
| -rw-r--r-- | etc/themes/modus-themes.el | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog.12 | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/warnings.el | 2 | ||||
| -rw-r--r-- | lisp/help-fns.el | 2 | ||||
| -rw-r--r-- | lisp/x-dnd.el | 2 | ||||
| -rw-r--r-- | src/xterm.c | 6 | ||||
| -rw-r--r-- | test/lisp/erc/resources/erc-scenarios-common.el | 4 | ||||
| -rw-r--r-- | 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 a8ce294ad9a..26739bf5b8d 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 | |||
| 2704 | event occurred, in milliseconds. Such a timestamp is reported | 2704 | event occurred, in milliseconds. Such a timestamp is reported |
| 2705 | relative to an arbitrary starting time that varies according to the | 2705 | relative to an arbitrary starting time that varies according to the |
| 2706 | window system in use. On the X Window System, for example, it is the | 2706 | window system in use. On the X Window System, for example, it is the |
| 2707 | number of miliseconds since the X server was started. | 2707 | number of milliseconds since the X server was started. |
| 2708 | @end defun | 2708 | @end defun |
| 2709 | 2709 | ||
| 2710 | These functions compute a position list given particular buffer | 2710 | These functions compute a position list given particular buffer |
diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org index a80bf6be8a6..ddd9595fc89 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): | |||
| 1253 | 1253 | ||
| 1254 | The ~popup~ key takes the same values as ~selection~. | 1254 | The ~popup~ key takes the same values as ~selection~. |
| 1255 | 1255 | ||
| 1256 | Apart from specfying each key separately, a fallback list is accepted. | 1256 | Apart from specifying each key separately, a fallback list is accepted. |
| 1257 | This is only useful when the desired aesthetic is the same across all | 1257 | This is only useful when the desired aesthetic is the same across all |
| 1258 | keys that are not explicitly referenced. For example, this: | 1258 | keys that are not explicitly referenced. For example, this: |
| 1259 | 1259 | ||
| @@ -3639,7 +3639,7 @@ it if you plan to control face attributes. | |||
| 3639 | :end: | 3639 | :end: |
| 3640 | #+cindex: Org custom emphasis faces | 3640 | #+cindex: Org custom emphasis faces |
| 3641 | 3641 | ||
| 3642 | Org provides the user option ~org-emphasis-alist~ which assosiates a | 3642 | Org provides the user option ~org-emphasis-alist~ which associates a |
| 3643 | character with a face, list of faces, or face attributes. The default | 3643 | character with a face, list of faces, or face attributes. The default |
| 3644 | specification of that variable looks like this: | 3644 | specification of that variable looks like this: |
| 3645 | 3645 | ||
diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el index 54e5e465b1f..e64a11b74f5 100644 --- a/etc/themes/modus-themes.el +++ b/etc/themes/modus-themes.el | |||
| @@ -2270,7 +2270,7 @@ follows (order is not significant): | |||
| 2270 | 2270 | ||
| 2271 | The `popup' key takes the same values as `selection'. | 2271 | The `popup' key takes the same values as `selection'. |
| 2272 | 2272 | ||
| 2273 | Apart from specfying each key separately, a fallback list is | 2273 | Apart from specifying each key separately, a fallback list is |
| 2274 | accepted. This is only useful when the desired aesthetic is the | 2274 | accepted. This is only useful when the desired aesthetic is the |
| 2275 | same across all keys that are not explicitly referenced. For | 2275 | same across all keys that are not explicitly referenced. For |
| 2276 | example, this: | 2276 | example, this: |
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index c45c8ae7351..a89e5155106 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 | |||
| @@ -14359,7 +14359,7 @@ | |||
| 14359 | * ldefs-boot.el: Likewise. | 14359 | * ldefs-boot.el: Likewise. |
| 14360 | 14360 | ||
| 14361 | * textmodes/bibtex.el (bibtex-validate-globally): Fix typo in a | 14361 | * textmodes/bibtex.el (bibtex-validate-globally): Fix typo in a |
| 14362 | message text: "Duplicat" => "Duplicate". | 14362 | message text. |
| 14363 | 14363 | ||
| 14364 | 2006-01-06 Sven Joachim <svenjoac@gmx.de> (tiny change) | 14364 | 2006-01-06 Sven Joachim <svenjoac@gmx.de> (tiny change) |
| 14365 | 14365 | ||
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el index 516fdeb10ea..d60eedbc9cd 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." | |||
| 209 | (text " stop ")) | 209 | (text " stop ")) |
| 210 | "Suppress warnings." | 210 | "Suppress warnings." |
| 211 | :version "29.1" | 211 | :version "29.1" |
| 212 | :help-echo "Click to supress this warning type") | 212 | :help-echo "Click to suppress this warning type") |
| 213 | 213 | ||
| 214 | (defun warnings-suppress (type) | 214 | (defun warnings-suppress (type) |
| 215 | (pcase (car | 215 | (pcase (car |
diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 768023b54c2..59a509b2215 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el | |||
| @@ -799,7 +799,7 @@ the C sources, too." | |||
| 799 | ;; different purposes, such as function name, var name, face name, | 799 | ;; different purposes, such as function name, var name, face name, |
| 800 | ;; property name, ...). | 800 | ;; property name, ...). |
| 801 | (concat | 801 | (concat |
| 802 | ;; The main "canonical" occurence of symbols is within '...'. | 802 | ;; The main "canonical" occurrence of symbols is within '...'. |
| 803 | "'" quoted "'" | 803 | "'" quoted "'" |
| 804 | ;; Commands can also occur as `M-x blabla'. | 804 | ;; Commands can also occur as `M-x blabla'. |
| 805 | "\\|M-x[ \t\n]+" quoted "\\_>" | 805 | "\\|M-x[ \t\n]+" quoted "\\_>" |
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el index bdfe444bc1d..2bda67fe3f3 100644 --- a/lisp/x-dnd.el +++ b/lisp/x-dnd.el | |||
| @@ -1480,7 +1480,7 @@ instead of returning \"E\".") | |||
| 1480 | (error '(STRING . "E"))))))) | 1480 | (error '(STRING . "E"))))))) |
| 1481 | 1481 | ||
| 1482 | (defun x-dnd-handle-octet-stream (_selection _type _value) | 1482 | (defun x-dnd-handle-octet-stream (_selection _type _value) |
| 1483 | "Handle a selecton request for `application/octet-stream'. | 1483 | "Handle a selection request for `application/octet-stream'. |
| 1484 | Return the contents of the XDS file." | 1484 | Return the contents of the XDS file." |
| 1485 | (cons 'application/octet-stream | 1485 | (cons 'application/octet-stream |
| 1486 | (ignore-errors | 1486 | (ignore-errors |
diff --git a/src/xterm.c b/src/xterm.c index 23a35aa1618..36797bc0abb 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -6837,7 +6837,7 @@ x_sync_trigger_fence (struct frame *f, XSyncValue value) | |||
| 6837 | idx = (n / 4) % 2; | 6837 | idx = (n / 4) % 2; |
| 6838 | 6838 | ||
| 6839 | #ifdef FRAME_DEBUG | 6839 | #ifdef FRAME_DEBUG |
| 6840 | fprintf (stderr, "Triggering synchonization fence: %lu\n", idx); | 6840 | fprintf (stderr, "Triggering synchronization fence: %lu\n", idx); |
| 6841 | #endif | 6841 | #endif |
| 6842 | 6842 | ||
| 6843 | XSyncTriggerFence (FRAME_X_DISPLAY (f), | 6843 | XSyncTriggerFence (FRAME_X_DISPLAY (f), |
| @@ -18928,7 +18928,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 18928 | { | 18928 | { |
| 18929 | /* Now clear dpyinfo->last_mouse_motion_frame, or | 18929 | /* Now clear dpyinfo->last_mouse_motion_frame, or |
| 18930 | gui_redo_mouse_highlight will end up highlighting the | 18930 | gui_redo_mouse_highlight will end up highlighting the |
| 18931 | last known poisition of the mouse if a tooltip frame is | 18931 | last known position of the mouse if a tooltip frame is |
| 18932 | later unmapped. */ | 18932 | later unmapped. */ |
| 18933 | 18933 | ||
| 18934 | if (f == dpyinfo->last_mouse_motion_frame) | 18934 | if (f == dpyinfo->last_mouse_motion_frame) |
| @@ -20397,7 +20397,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 20397 | { | 20397 | { |
| 20398 | /* Now clear dpyinfo->last_mouse_motion_frame, or | 20398 | /* Now clear dpyinfo->last_mouse_motion_frame, or |
| 20399 | gui_redo_mouse_highlight will end up highlighting | 20399 | gui_redo_mouse_highlight will end up highlighting |
| 20400 | the last known poisition of the mouse if a | 20400 | the last known position of the mouse if a |
| 20401 | tooltip frame is later unmapped. */ | 20401 | tooltip frame is later unmapped. */ |
| 20402 | 20402 | ||
| 20403 | if (f == dpyinfo->last_mouse_motion_frame) | 20403 | 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 cbabfcd26be..bc2cb68cd86 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 | |||
| 142 | (declare (indent 1)) | 142 | (declare (indent 1)) |
| 143 | 143 | ||
| 144 | (let* ((orig-autojoin-mode (make-symbol "orig-autojoin-mode")) | 144 | (let* ((orig-autojoin-mode (make-symbol "orig-autojoin-mode")) |
| 145 | (combind `((,orig-autojoin-mode (bound-and-true-p erc-autojoin-mode)) | 145 | (combined `((,orig-autojoin-mode (bound-and-true-p erc-autojoin-mode)) |
| 146 | ,@(erc-scenarios-common--make-bindings bindings)))) | 146 | ,@(erc-scenarios-common--make-bindings bindings)))) |
| 147 | 147 | ||
| 148 | `(erc-d-t-with-cleanup (,@combind) | 148 | `(erc-d-t-with-cleanup (,@combined) |
| 149 | 149 | ||
| 150 | (ert-info ("Restore autojoin, etc., kill ERC buffers") | 150 | (ert-info ("Restore autojoin, etc., kill ERC buffers") |
| 151 | (dolist (buf (buffer-list)) | 151 | (dolist (buf (buffer-list)) |
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index e2cafc240b9..a3e80e89562 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', | |||
| 2481 | (insert-file-contents tmp-name) | 2481 | (insert-file-contents tmp-name) |
| 2482 | (should (string-equal (buffer-string) "foo"))) | 2482 | (should (string-equal (buffer-string) "foo"))) |
| 2483 | 2483 | ||
| 2484 | ;; Write empty string. Used for creation of temprorary files. | 2484 | ;; Write empty string. Used for creation of temporary files. |
| 2485 | ;; Since Emacs 27.1. | 2485 | ;; Since Emacs 27.1. |
| 2486 | (when (fboundp 'make-empty-file) | 2486 | (when (fboundp 'make-empty-file) |
| 2487 | (with-no-warnings | 2487 | (with-no-warnings |