summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog.162
-rw-r--r--lisp/ChangeLog.172
-rw-r--r--lisp/progmodes/cc-langs.el4
-rw-r--r--lisp/progmodes/executable.el4
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 @@
(ses-formula-references): Robustify against self-referring cells.
(ses-mode): Use ses-set-localvars.
(ses-command-hook): Add call to ses-initialize-Dijkstra-attempt
- before lauching the update processing.
+ before launching the update processing.
(ses-initialize-Dijkstra-attempt): New function.
(ses-recalculate-cell): Update for cycle detection based on
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 @@
2014-01-10 Eric S. Raymond <esr@thyrsus.com>
- * version.el (emacs-bzr-get-version): Restore compatibilty with
+ * version.el (emacs-bzr-get-version): Restore compatibility with
24.3 (Tested).
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."
(make-obsolete-variable 'c-opt-op-identitier-prefix 'c-opt-op-identifier-prefix
"CC Mode 5.31.4, 2006-04-14")
-(c-lang-defconst c-ambiguous-overloadable-or-identifier-prefices
+(c-lang-defconst c-ambiguous-overloadable-or-identifier-prefixes
;; A list of strings which can be either overloadable operators or
;; identifier prefixes.
t (c--intersection
@@ -1199,7 +1199,7 @@ This regexp is assumed to not match any non-operator identifier."
;; A regexp matching strings which can be either overloadable operators
;; or identifier prefixes.
t (c-make-keywords-re
- t (c-lang-const c-ambiguous-overloadable-or-identifier-prefices)))
+ t (c-lang-const c-ambiguous-overloadable-or-identifier-prefixes)))
(c-lang-defvar c-ambiguous-overloadable-or-identifier-prefix-re
(c-lang-const c-ambiguous-overloadable-or-identifier-prefix-re))
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."
(and argument (string< "" argument) " ")
argument))
- ;; For backward compatibilty, allow `executable-prefix-env' to be
- ;; overriden by custom `executable-prefix'.
+ ;; For backward compatibility, allow `executable-prefix-env' to be
+ ;; overridden by custom `executable-prefix'.
(if (string-match "#!\\([ \t]*/usr/bin/env[ \t]*\\)?$" executable-prefix)
(if executable-prefix-env
(setq argument (concat "/usr/bin/env "