diff options
| author | Paul Eggert | 2020-08-13 16:46:12 -0700 |
|---|---|---|
| committer | Paul Eggert | 2020-08-13 16:48:16 -0700 |
| commit | cf0ee6f49b4b0b03db2c3f9fe93e1a486472e831 (patch) | |
| tree | 631842f1782636aeb0a1fbb82a667f1ea92c729b | |
| parent | 16f4f266324077f5a50090bd1c8147c7cbe37e0e (diff) | |
| download | emacs-cf0ee6f49b4b0b03db2c3f9fe93e1a486472e831.tar.gz emacs-cf0ee6f49b4b0b03db2c3f9fe93e1a486472e831.zip | |
; spelling fixes
| -rw-r--r-- | ChangeLog.3 | 2 | ||||
| -rw-r--r-- | lisp/desktop.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/rx.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 2 | ||||
| -rw-r--r-- | lisp/simple.el | 2 | ||||
| -rw-r--r-- | src/composite.c | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 4 | ||||
| -rw-r--r-- | 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 @@ | |||
| 2958 | * doc/lispref/searching.texi (Rx Constructs): Document. | 2958 | * doc/lispref/searching.texi (Rx Constructs): Document. |
| 2959 | * lisp/emacs-lisp/rx.el (rx--normalise-or-arg) | 2959 | * lisp/emacs-lisp/rx.el (rx--normalise-or-arg) |
| 2960 | (rx--all-string-or-args): New. | 2960 | (rx--all-string-or-args): New. |
| 2961 | (rx--translate-or): Normalise arguments first, and check for strings | 2961 | (rx--translate-or): Normalize arguments first, and check for strings |
| 2962 | in subforms. | 2962 | in subforms. |
| 2963 | (rx--expand-eval): Extracted from rx--translate-eval. | 2963 | (rx--expand-eval): Extracted from rx--translate-eval. |
| 2964 | (rx--translate-eval): Call rx--expand-eval. | 2964 | (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. | |||
| 1037 | 1037 | ||
| 1038 | To upgrade a version 206 file to version 208, call this command | 1038 | To upgrade a version 206 file to version 208, call this command |
| 1039 | explicitly with a prefix argument: \\[universal-argument] \\[desktop-save]. | 1039 | explicitly with a prefix argument: \\[universal-argument] \\[desktop-save]. |
| 1040 | If you are upgrading from Emacs 24 or older, we recommed to do | 1040 | If you are upgrading from Emacs 24 or older, we recommend to do |
| 1041 | this once you decide you no longer need compatibility with versions | 1041 | this once you decide you no longer need compatibility with versions |
| 1042 | of Emacs before 25.1. | 1042 | of Emacs before 25.1. |
| 1043 | 1043 | ||
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." | |||
| 255 | x) | 255 | x) |
| 256 | 256 | ||
| 257 | (defun rx--normalise-or-arg (form) | 257 | (defun rx--normalise-or-arg (form) |
| 258 | "Normalise the `or' argument FORM. | 258 | "Normalize the `or' argument FORM. |
| 259 | Characters become strings, user-definitions and `eval' forms are expanded, | 259 | Characters become strings, user-definitions and `eval' forms are expanded, |
| 260 | and `or' forms are normalised recursively." | 260 | and `or' forms are normalized recursively." |
| 261 | (cond ((characterp form) | 261 | (cond ((characterp form) |
| 262 | (char-to-string form)) | 262 | (char-to-string form)) |
| 263 | ((and (consp form) (memq (car form) '(or |))) | 263 | ((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." | |||
| 382 | c-macro-cache-syntactic nil | 382 | c-macro-cache-syntactic nil |
| 383 | c-macro-cache-no-comment nil)) | 383 | c-macro-cache-no-comment nil)) |
| 384 | (save-match-data | 384 | (save-match-data |
| 385 | (let ((safe-pos (point))) ; a point ouside any literal. | 385 | (let ((safe-pos (point))) ; a point outside any literal. |
| 386 | ;; Move over stuff followed by a multiline block comment lacking | 386 | ;; Move over stuff followed by a multiline block comment lacking |
| 387 | ;; escaped newlines each time around this loop. | 387 | ;; escaped newlines each time around this loop. |
| 388 | (while | 388 | (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." | |||
| 247 | extra-test-exclusive) | 247 | extra-test-exclusive) |
| 248 | "Try the current buffer when outside navigation. | 248 | "Try the current buffer when outside navigation. |
| 249 | But return nil if we navigated to the current buffer by the means | 249 | But return nil if we navigated to the current buffer by the means |
| 250 | of `next-error' command. Othewise, return it if it's next-error | 250 | of `next-error' command. Otherwise, return it if it's next-error |
| 251 | capable." | 251 | capable." |
| 252 | ;; Check that next-error-buffer has no buffer-local value | 252 | ;; Check that next-error-buffer has no buffer-local value |
| 253 | ;; (i.e. we never navigated to the current buffer from another), | 253 | ;; (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, | |||
| 1263 | is backward in the buffer, which can only happen if the | 1263 | is backward in the buffer, which can only happen if the |
| 1264 | display routines were called to perform the bidi | 1264 | display routines were called to perform the bidi |
| 1265 | reordering. But it doesn't harm to test for that, and | 1265 | reordering. But it doesn't harm to test for that, and |
| 1266 | avoid someon raising their brows and thinking it's a | 1266 | avoid someone raising their brows and thinking it's a |
| 1267 | subtle bug... */ | 1267 | subtle bug... */ |
| 1268 | if (bidi_level < 0) | 1268 | if (bidi_level < 0) |
| 1269 | direction = Qnil; | 1269 | 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 <https://www.gnu.org/licenses/>. */ | |||
| 180 | present (non-empty) only if the corresponding display margin is | 180 | present (non-empty) only if the corresponding display margin is |
| 181 | shown in the window. If the glyph array for a marginal area is not | 181 | shown in the window. If the glyph array for a marginal area is not |
| 182 | present its beginning and end coincide, i.e. such arrays are | 182 | present its beginning and end coincide, i.e. such arrays are |
| 183 | actually empty (they contain no glyphs). Frame glyph matrics, used | 183 | actually empty (they contain no glyphs). Frame glyph matrices, used |
| 184 | on text-mode terminals (see below) never have marginal areas, they | 184 | on text-mode terminals (see below) never have marginal areas; they |
| 185 | treat the entire frame-wide row of glyphs as a single large "text | 185 | treat the entire frame-wide row of glyphs as a single large "text |
| 186 | area". | 186 | area". |
| 187 | 187 | ||
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 | |||
| 8035 | always trigger an immediate resize of the child frame. This method is | 8035 | always trigger an immediate resize of the child frame. This method is |
| 8036 | deprecated by GTK and may not work in future versions of that toolkit. | 8036 | deprecated by GTK and may not work in future versions of that toolkit. |
| 8037 | It also may freeze Emacs when used with other desktop environments. It | 8037 | It also may freeze Emacs when used with other desktop environments. It |
| 8038 | avoids, however, the unpleasent flicker induced by the hiding approach. | 8038 | avoids, however, the unpleasant flicker induced by the hiding approach. |
| 8039 | 8039 | ||
| 8040 | This variable is considered a temporary workaround and will be hopefully | 8040 | This variable is considered a temporary workaround and will be hopefully |
| 8041 | eliminated in future versions of Emacs. */); | 8041 | eliminated in future versions of Emacs. */); |