From cf0ee6f49b4b0b03db2c3f9fe93e1a486472e831 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 13 Aug 2020 16:46:12 -0700 Subject: [PATCH] ; spelling fixes --- ChangeLog.3 | 2 +- lisp/desktop.el | 2 +- lisp/emacs-lisp/rx.el | 4 ++-- lisp/progmodes/cc-engine.el | 2 +- lisp/simple.el | 2 +- src/composite.c | 2 +- src/xdisp.c | 4 ++-- src/xfns.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ChangeLog.3 b/ChangeLog.3 index 6418f9c8a2c..1a530118995 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -2958,7 +2958,7 @@ * doc/lispref/searching.texi (Rx Constructs): Document. * lisp/emacs-lisp/rx.el (rx--normalise-or-arg) (rx--all-string-or-args): New. - (rx--translate-or): Normalise arguments first, and check for strings + (rx--translate-or): Normalize arguments first, and check for strings in subforms. (rx--expand-eval): Extracted from rx--translate-eval. (rx--translate-eval): Call rx--expand-eval. diff --git a/lisp/desktop.el b/lisp/desktop.el index b15ebc9b031..94de6c885e5 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1037,7 +1037,7 @@ file. To upgrade a version 206 file to version 208, call this command explicitly with a prefix argument: \\[universal-argument] \\[desktop-save]. -If you are upgrading from Emacs 24 or older, we recommed to do +If you are upgrading from Emacs 24 or older, we recommend to do this once you decide you no longer need compatibility with versions of Emacs before 25.1. diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index aa4b2addd47..6564563e7ec 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -255,9 +255,9 @@ Left-fold the list L, starting with X, by the binary function F." x) (defun rx--normalise-or-arg (form) - "Normalise the `or' argument FORM. + "Normalize the `or' argument FORM. Characters become strings, user-definitions and `eval' forms are expanded, -and `or' forms are normalised recursively." +and `or' forms are normalized recursively." (cond ((characterp form) (char-to-string form)) ((and (consp form) (memq (car form) '(or |))) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index bccef6890f8..34490d1356a 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -382,7 +382,7 @@ comment at the start of cc-engine.el for more info." c-macro-cache-syntactic nil c-macro-cache-no-comment nil)) (save-match-data - (let ((safe-pos (point))) ; a point ouside any literal. + (let ((safe-pos (point))) ; a point outside any literal. ;; Move over stuff followed by a multiline block comment lacking ;; escaped newlines each time around this loop. (while diff --git a/lisp/simple.el b/lisp/simple.el index e4958de113e..3ea00d44a03 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -247,7 +247,7 @@ from which next-error navigated, and a target buffer TO-BUFFER." extra-test-exclusive) "Try the current buffer when outside navigation. But return nil if we navigated to the current buffer by the means -of `next-error' command. Othewise, return it if it's next-error +of `next-error' command. Otherwise, return it if it's next-error capable." ;; Check that next-error-buffer has no buffer-local value ;; (i.e. we never navigated to the current buffer from another), diff --git a/src/composite.c b/src/composite.c index a5288cb8a25..bbb36dcbfa2 100644 --- a/src/composite.c +++ b/src/composite.c @@ -1263,7 +1263,7 @@ composition_reseat_it (struct composition_it *cmp_it, ptrdiff_t charpos, is backward in the buffer, which can only happen if the display routines were called to perform the bidi reordering. But it doesn't harm to test for that, and - avoid someon raising their brows and thinking it's a + avoid someone raising their brows and thinking it's a subtle bug... */ if (bidi_level < 0) direction = Qnil; diff --git a/src/xdisp.c b/src/xdisp.c index 37fe3800784..ad0ab9987d8 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -180,8 +180,8 @@ along with GNU Emacs. If not, see . */ present (non-empty) only if the corresponding display margin is shown in the window. If the glyph array for a marginal area is not present its beginning and end coincide, i.e. such arrays are - actually empty (they contain no glyphs). Frame glyph matrics, used - on text-mode terminals (see below) never have marginal areas, they + actually empty (they contain no glyphs). Frame glyph matrices, used + on text-mode terminals (see below) never have marginal areas; they treat the entire frame-wide row of glyphs as a single large "text area". diff --git a/src/xfns.c b/src/xfns.c index f9a00a6dafd..6f7c590ecee 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -8035,7 +8035,7 @@ If this equals the symbol 'resize-mode', Emacs uses GTK's resize mode to always trigger an immediate resize of the child frame. This method is deprecated by GTK and may not work in future versions of that toolkit. It also may freeze Emacs when used with other desktop environments. It -avoids, however, the unpleasent flicker induced by the hiding approach. +avoids, however, the unpleasant flicker induced by the hiding approach. This variable is considered a temporary workaround and will be hopefully eliminated in future versions of Emacs. */); -- 2.39.5