diff options
| author | Paul Eggert | 2017-09-10 09:20:27 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-09-10 09:24:37 -0700 |
| commit | cdef84fb6893f69ffee1a99fe82a262e02e59bf5 (patch) | |
| tree | f26e8fe49677db19be4fad553ebf123d7b4bd478 | |
| parent | 4973788c6aa2636407b34da840088f635ba6914a (diff) | |
| download | emacs-cdef84fb6893f69ffee1a99fe82a262e02e59bf5.tar.gz emacs-cdef84fb6893f69ffee1a99fe82a262e02e59bf5.zip | |
Spelling fixes
* lisp/progmodes/cc-langs.el:
(c-ambiguous-overloadable-or-identifier-prefixes): Rename from
c-ambiguous-overloadable-or-identifier-prefices. Caller changed.
| -rw-r--r-- | doc/misc/org.texi | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog.16 | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog.17 | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/executable.el | 4 | ||||
| -rw-r--r-- | test/lib-src/emacsclient-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/dired-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/ls-lisp-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/register-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/simple-tests.el | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 067ae7bbc52..44fcb94f972 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi | |||
| @@ -7641,7 +7641,7 @@ javascript:location.href='org-protocol://open-source?&url='+ | |||
| 7641 | @vindex org-protocol-project-alist | 7641 | @vindex org-protocol-project-alist |
| 7642 | The variable @code{org-protocol-project-alist} maps URLs to local file names, | 7642 | The variable @code{org-protocol-project-alist} maps URLs to local file names, |
| 7643 | by stripping URL parameters from the end and replacing the @code{:base-url} | 7643 | by stripping URL parameters from the end and replacing the @code{:base-url} |
| 7644 | with @code{:working-diretory} and @code{:online-suffix} with | 7644 | with @code{:working-directory} and @code{:online-suffix} with |
| 7645 | @code{:working-suffix}. For example, assuming you own a local copy of | 7645 | @code{:working-suffix}. For example, assuming you own a local copy of |
| 7646 | @url{http://orgmode.org/worg/} contents at @file{/home/user/worg}, you can | 7646 | @url{http://orgmode.org/worg/} contents at @file{/home/user/worg}, you can |
| 7647 | set @code{org-protocol-project-alist} to the following | 7647 | set @code{org-protocol-project-alist} to the following |
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16 index ffd99f7438c..fb5aee17a77 100644 --- a/lisp/ChangeLog.16 +++ b/lisp/ChangeLog.16 | |||
| @@ -20919,7 +20919,7 @@ | |||
| 20919 | (ses-formula-references): Robustify against self-referring cells. | 20919 | (ses-formula-references): Robustify against self-referring cells. |
| 20920 | (ses-mode): Use ses-set-localvars. | 20920 | (ses-mode): Use ses-set-localvars. |
| 20921 | (ses-command-hook): Add call to ses-initialize-Dijkstra-attempt | 20921 | (ses-command-hook): Add call to ses-initialize-Dijkstra-attempt |
| 20922 | before lauching the update processing. | 20922 | before launching the update processing. |
| 20923 | (ses-initialize-Dijkstra-attempt): New function. | 20923 | (ses-initialize-Dijkstra-attempt): New function. |
| 20924 | (ses-recalculate-cell): Update for cycle detection based on | 20924 | (ses-recalculate-cell): Update for cycle detection based on |
| 20925 | Dijkstra algorithm. | 20925 | Dijkstra algorithm. |
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17 index 6dfddf72e8f..5c415de0474 100644 --- a/lisp/ChangeLog.17 +++ b/lisp/ChangeLog.17 | |||
| @@ -14161,7 +14161,7 @@ | |||
| 14161 | 14161 | ||
| 14162 | 2014-01-10 Eric S. Raymond <esr@thyrsus.com> | 14162 | 2014-01-10 Eric S. Raymond <esr@thyrsus.com> |
| 14163 | 14163 | ||
| 14164 | * version.el (emacs-bzr-get-version): Restore compatibilty with | 14164 | * version.el (emacs-bzr-get-version): Restore compatibility with |
| 14165 | 24.3 (Tested). | 14165 | 24.3 (Tested). |
| 14166 | 14166 | ||
| 14167 | 2014-01-10 Bozhidar Batsov <bozhidar@batsov.com> | 14167 | 2014-01-10 Bozhidar Batsov <bozhidar@batsov.com> |
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index d4eae06f290..8a4adf1f7fb 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el | |||
| @@ -1185,7 +1185,7 @@ This regexp is assumed to not match any non-operator identifier." | |||
| 1185 | (make-obsolete-variable 'c-opt-op-identitier-prefix 'c-opt-op-identifier-prefix | 1185 | (make-obsolete-variable 'c-opt-op-identitier-prefix 'c-opt-op-identifier-prefix |
| 1186 | "CC Mode 5.31.4, 2006-04-14") | 1186 | "CC Mode 5.31.4, 2006-04-14") |
| 1187 | 1187 | ||
| 1188 | (c-lang-defconst c-ambiguous-overloadable-or-identifier-prefices | 1188 | (c-lang-defconst c-ambiguous-overloadable-or-identifier-prefixes |
| 1189 | ;; A list of strings which can be either overloadable operators or | 1189 | ;; A list of strings which can be either overloadable operators or |
| 1190 | ;; identifier prefixes. | 1190 | ;; identifier prefixes. |
| 1191 | t (c--intersection | 1191 | t (c--intersection |
| @@ -1199,7 +1199,7 @@ This regexp is assumed to not match any non-operator identifier." | |||
| 1199 | ;; A regexp matching strings which can be either overloadable operators | 1199 | ;; A regexp matching strings which can be either overloadable operators |
| 1200 | ;; or identifier prefixes. | 1200 | ;; or identifier prefixes. |
| 1201 | t (c-make-keywords-re | 1201 | t (c-make-keywords-re |
| 1202 | t (c-lang-const c-ambiguous-overloadable-or-identifier-prefices))) | 1202 | t (c-lang-const c-ambiguous-overloadable-or-identifier-prefixes))) |
| 1203 | (c-lang-defvar c-ambiguous-overloadable-or-identifier-prefix-re | 1203 | (c-lang-defvar c-ambiguous-overloadable-or-identifier-prefix-re |
| 1204 | (c-lang-const c-ambiguous-overloadable-or-identifier-prefix-re)) | 1204 | (c-lang-const c-ambiguous-overloadable-or-identifier-prefix-re)) |
| 1205 | 1205 | ||
diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el index 7c040e74955..ebdb516de18 100644 --- a/lisp/progmodes/executable.el +++ b/lisp/progmodes/executable.el | |||
| @@ -228,8 +228,8 @@ executable." | |||
| 228 | (and argument (string< "" argument) " ") | 228 | (and argument (string< "" argument) " ") |
| 229 | argument)) | 229 | argument)) |
| 230 | 230 | ||
| 231 | ;; For backward compatibilty, allow `executable-prefix-env' to be | 231 | ;; For backward compatibility, allow `executable-prefix-env' to be |
| 232 | ;; overriden by custom `executable-prefix'. | 232 | ;; overridden by custom `executable-prefix'. |
| 233 | (if (string-match "#!\\([ \t]*/usr/bin/env[ \t]*\\)?$" executable-prefix) | 233 | (if (string-match "#!\\([ \t]*/usr/bin/env[ \t]*\\)?$" executable-prefix) |
| 234 | (if executable-prefix-env | 234 | (if executable-prefix-env |
| 235 | (setq argument (concat "/usr/bin/env " | 235 | (setq argument (concat "/usr/bin/env " |
diff --git a/test/lib-src/emacsclient-tests.el b/test/lib-src/emacsclient-tests.el index 4b7fa47989d..beca972aad4 100644 --- a/test/lib-src/emacsclient-tests.el +++ b/test/lib-src/emacsclient-tests.el | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | ;; Skip if emacsclient was compiled with -pg (bug#28319). | 43 | ;; Skip if emacsclient was compiled with -pg (bug#28319). |
| 44 | ;; Use ert--skip-unless rather than skip-unless to silence compiler. | 44 | ;; Use ert--skip-unless rather than skip-unless to silence compiler. |
| 45 | (ert--skip-unless (not (and (stringp stat) | 45 | (ert--skip-unless (not (and (stringp stat) |
| 46 | (string-match-p "rofiling" stat)))) | 46 | (string-match-p "Profiling" stat)))) |
| 47 | (should (eq 0 stat)))) | 47 | (should (eq 0 stat)))) |
| 48 | 48 | ||
| 49 | (ert-deftest emacsclient-test-alternate-editor-allows-arguments () | 49 | (ert-deftest emacsclient-test-alternate-editor-allows-arguments () |
diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el index 3c460d0151e..1f6e060832e 100644 --- a/test/lisp/dired-tests.el +++ b/test/lisp/dired-tests.el | |||
| @@ -380,7 +380,7 @@ | |||
| 380 | 380 | ||
| 381 | (ert-deftest dired-test-bug27940 () | 381 | (ert-deftest dired-test-bug27940 () |
| 382 | "Test for http://debbugs.gnu.org/27940 ." | 382 | "Test for http://debbugs.gnu.org/27940 ." |
| 383 | ;; If just empty dirs we shouln't be prompted. | 383 | ;; If just empty dirs we shouldn't be prompted. |
| 384 | (dired-test-with-temp-dirs | 384 | (dired-test-with-temp-dirs |
| 385 | 'just-empty-dirs | 385 | 'just-empty-dirs |
| 386 | (let (asked) | 386 | (let (asked) |
diff --git a/test/lisp/ls-lisp-tests.el b/test/lisp/ls-lisp-tests.el index d24b30e5f22..1698e0967d0 100644 --- a/test/lisp/ls-lisp-tests.el +++ b/test/lisp/ls-lisp-tests.el | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2017 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2017 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Tino Calacha <tino.calancha@gmail.com> | 5 | ;; Author: Tino Calancha <tino.calancha@gmail.com> |
| 6 | ;; Keywords: | 6 | ;; Keywords: |
| 7 | 7 | ||
| 8 | ;; This file is part of GNU Emacs. | 8 | ;; This file is part of GNU Emacs. |
diff --git a/test/lisp/register-tests.el b/test/lisp/register-tests.el index 0425bc0e0f4..2e31602b127 100644 --- a/test/lisp/register-tests.el +++ b/test/lisp/register-tests.el | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2017 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2017 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Tino Calacha <tino.calancha@gmail.com> | 5 | ;; Author: Tino Calancha <tino.calancha@gmail.com> |
| 6 | ;; Keywords: | 6 | ;; Keywords: |
| 7 | 7 | ||
| 8 | ;; This file is part of GNU Emacs. | 8 | ;; This file is part of GNU Emacs. |
diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el index 729001bdf3a..7cb7107ceda 100644 --- a/test/lisp/simple-tests.el +++ b/test/lisp/simple-tests.el | |||
| @@ -505,7 +505,7 @@ See Bug#21722." | |||
| 505 | (setq-local fill-prefix " ") | 505 | (setq-local fill-prefix " ") |
| 506 | (set-fill-column 5) | 506 | (set-fill-column 5) |
| 507 | ;; Shouldn't break after 'foo' (3 characters) when the next | 507 | ;; Shouldn't break after 'foo' (3 characters) when the next |
| 508 | ;; line is indented >= to that, that woudln't result in shorter | 508 | ;; line is indented >= to that, that wouldn't result in shorter |
| 509 | ;; lines. | 509 | ;; lines. |
| 510 | (insert "foo bar") | 510 | (insert "foo bar") |
| 511 | (do-auto-fill) | 511 | (do-auto-fill) |