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 /lisp | |
| 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.
Diffstat (limited to 'lisp')
| -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 |
4 files changed, 6 insertions, 6 deletions
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 " |